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, 5 insertions, 8 deletions

diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index 6603ba72b7..9cdc769431 100644
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -1953,9 +1953,8 @@ public:
 
   // Assumptions.
 
-  virtual const GRState* EvalAssume(GRStateManager& VMgr,
-                                       const GRState* St, SVal Cond,
-                                       bool Assumption, bool& isFeasible);
+  virtual const GRState *EvalAssume(const GRState* state, SVal condition,
+                                    bool assumption);
 };
 
 } // end anonymous namespace
@@ -3307,10 +3306,8 @@ void CFRefCount::EvalReturn(ExplodedNodeSet<GRState>& Dst,
 
 // Assumptions.
 
-const GRState* CFRefCount::EvalAssume(GRStateManager& VMgr,
-                                      const GRState* state,
-                                      SVal Cond, bool Assumption,
-                                      bool& isFeasible) {
+const GRState* CFRefCount::EvalAssume(const GRState *state,
+                                      SVal Cond, bool Assumption) {
 
   // FIXME: We may add to the interface of EvalAssume the list of symbols
   //  whose assumptions have changed.  For now we just iterate through the
@@ -3329,7 +3326,7 @@ const GRState* CFRefCount::EvalAssume(GRStateManager& VMgr,
   for (RefBindings::iterator I=B.begin(), E=B.end(); I!=E; ++I) {    
     // Check if the symbol is null (or equal to any constant).
     // If this is the case, stop tracking the symbol.
-    if (VMgr.getSymVal(state, I.getKey())) {
+    if (state->getSymVal(I.getKey())) {
       changed = true;
       B = RefBFactory.Remove(B, I.getKey());
     }