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.

llvm-svn: 58359
This commit is contained in:
Zhongxing Xu 2008-10-29 02:34:02 +00:00
parent 2500aaebdd
commit 628ae879ea
6 changed files with 19 additions and 23 deletions

View File

@ -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

View File

@ -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;

View File

@ -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();

View File

@ -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);
}
}

View File

@ -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;

View File

@ -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();