libAnalysis:

- Remove the 'isFeasible' flag from all uses of 'Assume'.
- Remove the 'Assume' methods from GRStateManager.  Now the only way to
  create a new GRState with an assumption is to use the new 'assume' methods
  in GRState.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@73731 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 2 insertions, 11 deletions

diff --git a/lib/Analysis/GRExprEngineInternalChecks.cpp b/lib/Analysis/GRExprEngineInternalChecks.cpp
index a0de13f702..838cb9867b 100644
--- a/lib/Analysis/GRExprEngineInternalChecks.cpp
+++ b/lib/Analysis/GRExprEngineInternalChecks.cpp
@@ -819,24 +819,15 @@ public:
     
     // Check if in the previous state it was feasible for this constraint
     // to *not* be true.
-    
-    GRStateManager &StateMgr = BRC.getStateManager();
-    bool isFeasible = false;    
-    if (StateMgr.Assume(PrevN->getState(), Constraint, !Assumption,
-                        isFeasible)) {
-      assert(isFeasible); // Eventually we don't need 'isFeasible'.
+    if (PrevN->getState()->assume(Constraint, !Assumption)) {
 
       isSatisfied = true;
       
       // As a sanity check, make sure that the negation of the constraint
       // was infeasible in the current state.  If it is feasible, we somehow
       // missed the transition point.
-      isFeasible = false;
-      if (StateMgr.Assume(N->getState(), Constraint, !Assumption,
-                          isFeasible)) {
-        assert(isFeasible);
+      if (N->getState()->assume(Constraint, !Assumption))
         return NULL;
-      }
       
       // We found the transition point for the constraint.  We now need to
       // pretty-print the constraint. (work-in-progress)