StoreManager::Retrieve and StoreManager::RemoveDeadBindings now take a GRState* argument instead of a Store. This allows them to use the GDM for storing other data.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@60570 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/GRState.cpp b/lib/Analysis/GRState.cpp
index dd296e0..83ab508 100644
--- a/lib/Analysis/GRState.cpp
+++ b/lib/Analysis/GRState.cpp
@@ -33,7 +33,7 @@
}
const GRState*
-GRStateManager::RemoveDeadBindings(const GRState* St, Stmt* Loc,
+GRStateManager::RemoveDeadBindings(const GRState* state, Stmt* Loc,
const LiveVariables& Liveness,
DeadSymbolsTy& DSymbols) {
@@ -45,17 +45,17 @@
// for optimum performance.
llvm::SmallVector<const MemRegion*, 10> RegionRoots;
StoreManager::LiveSymbolsTy LSymbols;
- GRState NewSt = *St;
+ GRState NewState = *state;
- NewSt.Env =
- EnvMgr.RemoveDeadBindings(NewSt.Env, Loc, Liveness, RegionRoots, LSymbols);
+ NewState.Env = EnvMgr.RemoveDeadBindings(NewState.Env, Loc, Liveness,
+ RegionRoots, LSymbols);
// Clean up the store.
DSymbols.clear();
- NewSt.St = StoreMgr->RemoveDeadBindings(St->getStore(), Loc, Liveness,
- RegionRoots, LSymbols, DSymbols);
+ NewState.St = StoreMgr->RemoveDeadBindings(&NewState, Loc, Liveness,
+ RegionRoots, LSymbols, DSymbols);
- return ConstraintMgr->RemoveDeadBindings(getPersistentState(NewSt),
+ return ConstraintMgr->RemoveDeadBindings(getPersistentState(NewState),
LSymbols, DSymbols);
}