Move clients over from using GRStateManager::BindXXX and friends to
GRState->bindXXX and friends (and constify some arguments along the way).


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@73740 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp
index c43c83b..728ac93 100644
--- a/lib/Analysis/GRExprEngine.cpp
+++ b/lib/Analysis/GRExprEngine.cpp
@@ -644,7 +644,7 @@
   if (!bitsInit || !T->isIntegerType() || Ctx.getTypeSize(T) > bits)
     return UnknownVal();
   
-  return StateMgr.GetSVal(state, Ex);
+  return state->getSVal(Ex);
 }
 
 void GRExprEngine::ProcessBranch(Stmt* Condition, Stmt* Term,
@@ -1284,10 +1284,9 @@
   const void *OSAtomicStoreTag = &magic_store;
   
   // Load 'theValue'.
-  GRStateManager &StateMgr = Engine.getStateManager();
   const GRState *state = Pred->getState();
   ExplodedNodeSet<GRState> Tmp;
-  SVal location = StateMgr.GetSVal(state, theValueExpr);
+  SVal location = state->getSVal(theValueExpr);
   Engine.EvalLoad(Tmp, theValueExpr, Pred, state, location, OSAtomicLoadTag);
 
   for (ExplodedNodeSet<GRState>::iterator I = Tmp.begin(), E = Tmp.end();
@@ -1310,8 +1309,7 @@
       // Perform the store.
       ExplodedNodeSet<GRState> TmpStore;
       Engine.EvalStore(TmpStore, theValueExpr, N, stateEqual, location, 
-                       StateMgr.GetSVal(stateEqual, newValueExpr),
-                       OSAtomicStoreTag);
+                       stateEqual->getSVal(newValueExpr), OSAtomicStoreTag);
       
       // Now bind the result of the comparison.
       for (ExplodedNodeSet<GRState>::iterator I2 = TmpStore.begin(),