Rename: AddDecl => BindDecl

BindDecl better describes what the function does:
  - Bind the VarDecl to its memory region
  - Bind the memory region to some initial value.

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

diff --git a/include/clang/Analysis/PathSensitive/GRState.h b/include/clang/Analysis/PathSensitive/GRState.h
index 265d028e8acaa2c73d76a18523da9e257705706b..5d91b2fa613f59b8f0089fcdb0101ec801d8a055 100644 (file)
--- a/include/clang/Analysis/PathSensitive/GRState.h
+++ b/include/clang/Analysis/PathSensitive/GRState.h
@@ -327,8 +327,8 @@ public:
 
   typedef StoreManager::DeadSymbolsTy DeadSymbolsTy;
 
-  const GRState* AddDecl(const GRState* St, const VarDecl* VD, Expr* Ex, 
-                         unsigned Count);
+  const GRState* BindDecl(const GRState* St, const VarDecl* VD, Expr* Ex, 
+                          unsigned Count);
   
   /// BindCompoundLiteral - Return the state that has the bindings currently
   ///  in 'state' plus the bindings for the CompoundLiteral.  'R' is the region

diff --git a/include/clang/Analysis/PathSensitive/Store.h b/include/clang/Analysis/PathSensitive/Store.h
index 41464c176fe781a7336f30ac84d81e3d9fbeff8c..4c08fe6dd39098de7de9feb3669e7dcd4a37065f 100644 (file)
--- a/include/clang/Analysis/PathSensitive/Store.h
+++ b/include/clang/Analysis/PathSensitive/Store.h
@@ -87,10 +87,10 @@ public:
                      llvm::SmallVectorImpl<const MemRegion*>& RegionRoots,
                      LiveSymbolsTy& LSymbols, DeadSymbolsTy& DSymbols) = 0;
 
-  virtual Store AddDecl(Store store,
-                        const VarDecl* VD, Expr* Ex, 
-                        SVal InitVal = UndefinedVal(), 
-                        unsigned Count = 0) = 0;
+  virtual Store BindDecl(Store store,
+                         const VarDecl* VD, Expr* Ex, 
+                         SVal InitVal = UndefinedVal(), 
+                         unsigned Count = 0) = 0;
 
   virtual void print(Store store, std::ostream& Out,
                      const char* nl, const char *sep) = 0;

diff --git a/lib/Analysis/BasicStore.cpp b/lib/Analysis/BasicStore.cpp
index 05c8523d2dc2c7581e77e2eddda95c557daaa2da..de5ff30db9fdc17c81bda1ac2efda9b7157d50c8 100644 (file)
--- a/lib/Analysis/BasicStore.cpp
+++ b/lib/Analysis/BasicStore.cpp
@@ -74,8 +74,8 @@ public:
 
   void iterBindings(Store store, BindingsHandler& f);
 
-  Store AddDecl(Store store, const VarDecl* VD, Expr* Ex,
-                SVal InitVal = UndefinedVal(), unsigned Count = 0);
+  Store BindDecl(Store store, const VarDecl* VD, Expr* Ex,
+                 SVal InitVal = UndefinedVal(), unsigned Count = 0);
 
   static inline VarBindingsTy GetVarBindings(Store store) {
     return VarBindingsTy(static_cast<const VarBindingsTy::TreeTy*>(store));
@@ -351,10 +351,8 @@ Store BasicStoreManager::getInitialStore() {
   return St;
 }
 
-Store BasicStoreManager::AddDecl(Store store,
-                                 const VarDecl* VD, Expr* Ex,
-                                 SVal InitVal, unsigned Count) {
-  
+Store BasicStoreManager::BindDecl(Store store, const VarDecl* VD, Expr* Ex,
+                                  SVal InitVal, unsigned Count) {
   BasicValueFactory& BasicVals = StateMgr.getBasicVals();
   SymbolManager& SymMgr = StateMgr.getSymbolManager();
   

diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp
index bbeebd6858a97299640999de700b8aaa754104ca..a9303330feeeef0ee9e90460a90d53b4f77387cb 100644 (file)
--- a/lib/Analysis/GRExprEngine.cpp
+++ b/lib/Analysis/GRExprEngine.cpp
@@ -1608,7 +1608,7 @@ void GRExprEngine::VisitDeclStmt(DeclStmt* DS, NodeTy* Pred, NodeSet& Dst) {
   
   for (NodeSet::iterator I=Tmp.begin(), E=Tmp.end(); I!=E; ++I) {
     const GRState* St = GetState(*I);
-    St = StateMgr.AddDecl(St, VD, Ex, Builder->getCurrentBlockCount());
+    St = StateMgr.BindDecl(St, VD, Ex, Builder->getCurrentBlockCount());
     MakeNode(Dst, DS, *I, St);
   }
 }

diff --git a/lib/Analysis/GRState.cpp b/lib/Analysis/GRState.cpp
index 03b724779e9d201b3186f14be3a95d1d73bbdcb8..f598ec4b703585f80db58825a3bb4e312fd1db35 100644 (file)
--- a/lib/Analysis/GRState.cpp
+++ b/lib/Analysis/GRState.cpp
@@ -73,16 +73,15 @@ const GRState* GRStateManager::SetSVal(const GRState* St, Loc LV,
   return getPersistentState(NewSt);    
 }
 
-const GRState* GRStateManager::AddDecl(const GRState* St, const VarDecl* VD, 
-                                       Expr* Ex, unsigned Count) {
+const GRState* GRStateManager::BindDecl(const GRState* St, const VarDecl* VD, 
+                                        Expr* Ex, unsigned Count) {
   Store OldStore = St->getStore();
   Store NewStore;
 
   if (Ex)
-    NewStore = StoreMgr->AddDecl(OldStore, VD, Ex, 
-                              GetSVal(St, Ex), Count);
+    NewStore = StoreMgr->BindDecl(OldStore, VD, Ex, GetSVal(St, Ex), Count);
   else
-    NewStore = StoreMgr->AddDecl(OldStore, VD, Ex);
+    NewStore = StoreMgr->BindDecl(OldStore, VD, Ex);
                               
   if (NewStore == OldStore)
     return St;

diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp
index 1c73ceae202cc66648280f8655ae36daca59c360..d5fb4d2a9af8c51251aaf171fe6cbc15f09e8c74 100644 (file)
--- a/lib/Analysis/RegionStore.cpp
+++ b/lib/Analysis/RegionStore.cpp
@@ -93,8 +93,8 @@ public:
     return store;
   }
 
-  Store AddDecl(Store store, const VarDecl* VD, Expr* Ex, SVal InitVal, 
-                unsigned Count);
+  Store BindDecl(Store store, const VarDecl* VD, Expr* Ex, SVal InitVal, 
+                 unsigned Count);
 
   static inline RegionBindingsTy GetRegionBindings(Store store) {
    return RegionBindingsTy(static_cast<const RegionBindingsTy::TreeTy*>(store));
@@ -292,9 +292,8 @@ Store RegionStoreManager::getInitialStore() {
   return St;
 }
 
-Store RegionStoreManager::AddDecl(Store store,
-                                  const VarDecl* VD, Expr* Ex,
-                                  SVal InitVal, unsigned Count) {
+Store RegionStoreManager::BindDecl(Store store, const VarDecl* VD, Expr* Ex,
+                                   SVal InitVal, unsigned Count) {
   BasicValueFactory& BasicVals = StateMgr.getBasicVals();
   SymbolManager& SymMgr = StateMgr.getSymbolManager();