[Analyzer] Try fixing ConstraintManager::assumeDual

[MaskRay]

Summary

This fixes test/Analysis/trustnonnullchecker_test.m in Debug mode.

[NoQ]

This should have been fixed by D52848.

This is a very important fundamental assertion, we definitely should not remove it.

[MaskRay]

In D52853#1254486, @NoQ wrote:

This should have been fixed by D52848.

This is a very important fundamental assertion, we definitely should not remove it.

Sorry I don't understand the code at all but I get a different result.

~/llvm/Debug/bin/llvm-lit test/Analysis/trustnonnullchecker_test.m => assert() fails

Reverting D52848 (rC343735) seems to unbreak the test...

[NoQ]

Hmm, wait, right, i might have an idea of what's going on. I think we need to revert.

[NoQ]

And, of course, we'll need to change __OPTIMIZE__ to NDEBUG.

Also thanks for reporting the problem!

[NoQ]

*reads the comments* no, NDEBUG won't work.

Ok, we'll take care of this, thanks!

[george.karpenkov]

Tracked in rdar://44992170.
Marking the test as unsupported for now.

[MaskRay]

Thanks for your prompt response rC343747 . I'll abandon this revision!

include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h

public:
 
   /// Returns a pair of states (StTrue, StFalse) where the given condition is
   /// assumed to be true or false, respectively.
   ProgramStatePair assumeDual(ProgramStateRef State, DefinedSVal Cond) {
     ProgramStateRef StTrue = assume(State, Cond, true);
 
     // If StTrue is infeasible, asserting the falseness of Cond is unnecessary
     // because the existing constraints already establish this.
-    if (!StTrue) {
-#ifndef __OPTIMIZE__
-      // This check is expensive and should be disabled even in Release+Asserts
-      // builds.
-      // FIXME: __OPTIMIZE__ is a GNU extension that Clang implements but MSVC
-      // does not. Is there a good equivalent there?
-      assert(assume(State, Cond, false) && "System is over constrained.");
-#endif
+    if (!StTrue)
       return ProgramStatePair((ProgramStateRef)nullptr, State);
-    }
 
     ProgramStateRef StFalse = assume(State, Cond, false);
     if (!StFalse) {
       // We are careful to return the original state, /not/ StTrue,
       // because we want to avoid having callers generate a new node
       // in the ExplodedGraph.
       return ProgramStatePair(State, (ProgramStateRef)nullptr);
     }