Simplify interface to Store::AddDecl

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

1 files changed, 9 insertions, 5 deletions

diff --git a/lib/Analysis/BasicStore.cpp b/lib/Analysis/BasicStore.cpp
index ad0e12aa4c..2ed89c6f7d 100644
--- a/lib/Analysis/BasicStore.cpp
+++ b/lib/Analysis/BasicStore.cpp
@@ -41,8 +41,8 @@ public:
                                    DeclRootsTy& DRoots, LiveSymbolsTy& LSymbols,
                                    DeadSymbolsTy& DSymbols);
 
-  virtual Store AddDecl(Store store, BasicValueFactory& BasicVals,
-                        SymbolManager& SymMgr, const VarDecl* VD, Expr* Ex, 
+  virtual Store AddDecl(Store store, GRStateManager& StateMgr,
+                        const VarDecl* VD, Expr* Ex, 
                         RVal InitVal = UndefinedVal(), unsigned Count = 0);
 
   static inline VarBindingsTy GetVarBindings(Store store) {
@@ -243,9 +243,13 @@ Store BasicStoreManager::getInitialStore(GRStateManager& StateMgr) {
   return St;
 }
 
-Store BasicStoreManager::AddDecl(Store store, BasicValueFactory& BasicVals,
-                                 SymbolManager& SymMgr, const VarDecl* VD, 
-                                 Expr* Ex, RVal InitVal, unsigned Count) {
+Store BasicStoreManager::AddDecl(Store store, GRStateManager& StateMgr,
+                                 const VarDecl* VD, Expr* Ex,
+                                 RVal InitVal, unsigned Count) {
+  
+  BasicValueFactory& BasicVals = StateMgr.getBasicVals();
+  SymbolManager& SymMgr = StateMgr.getSymbolManager();
+  
   // BasicStore does not model arrays and structs.
   if (VD->getType()->isArrayType() || VD->getType()->isStructureType())
     return store;