Modify Store interface: GetSVal/SetSVal => Retrieve/Bind.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@57896 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/BasicStore.cpp b/lib/Analysis/BasicStore.cpp
index 8fc438d..c37db36 100644
--- a/lib/Analysis/BasicStore.cpp
+++ b/lib/Analysis/BasicStore.cpp
@@ -34,8 +34,8 @@
virtual ~BasicStoreManager() {}
- virtual SVal GetSVal(Store St, Loc LV, QualType T);
- virtual Store SetSVal(Store St, Loc LV, SVal V);
+ virtual SVal Retrieve(Store St, Loc LV, QualType T);
+ virtual Store Bind(Store St, Loc LV, SVal V);
virtual Store Remove(Store St, Loc LV);
virtual Store getInitialStore();
@@ -133,7 +133,7 @@
return Base;
}
-SVal BasicStoreManager::GetSVal(Store St, Loc LV, QualType T) {
+SVal BasicStoreManager::Retrieve(Store St, Loc LV, QualType T) {
if (isa<UnknownVal>(LV))
return UnknownVal();
@@ -177,7 +177,7 @@
return UnknownVal();
}
-Store BasicStoreManager::SetSVal(Store store, Loc LV, SVal V) {
+Store BasicStoreManager::Bind(Store store, Loc LV, SVal V) {
switch (LV.getSubKind()) {
case loc::MemRegionKind: {
const VarRegion* R =
@@ -315,7 +315,7 @@
? SVal::GetSymbolValue(StateMgr.getSymbolManager(), VD)
: UndefinedVal();
- St = SetSVal(St, loc::MemRegionVal(MRMgr.getVarRegion(VD)), X);
+ St = Bind(St, loc::MemRegionVal(MRMgr.getVarRegion(VD)), X);
}
}
}
@@ -355,16 +355,16 @@
if (!Ex) {
QualType T = VD->getType();
if (Loc::IsLocType(T))
- store = SetSVal(store, getLoc(VD),
- loc::ConcreteInt(BasicVals.getValue(0, T)));
+ store = Bind(store, getLoc(VD),
+ loc::ConcreteInt(BasicVals.getValue(0, T)));
else if (T->isIntegerType())
- store = SetSVal(store, getLoc(VD),
- nonloc::ConcreteInt(BasicVals.getValue(0, T)));
+ store = Bind(store, getLoc(VD),
+ nonloc::ConcreteInt(BasicVals.getValue(0, T)));
else {
// assert(0 && "ignore other types of variables");
}
} else {
- store = SetSVal(store, getLoc(VD), InitVal);
+ store = Bind(store, getLoc(VD), InitVal);
}
}
} else {
@@ -382,7 +382,7 @@
: cast<SVal>(nonloc::SymbolVal(Sym));
}
- store = SetSVal(store, getLoc(VD), V);
+ store = Bind(store, getLoc(VD), V);
}
}
diff --git a/lib/Analysis/GRState.cpp b/lib/Analysis/GRState.cpp
index 09275e2..828be22 100644
--- a/lib/Analysis/GRState.cpp
+++ b/lib/Analysis/GRState.cpp
@@ -63,7 +63,7 @@
SVal V) {
Store OldStore = St->getStore();
- Store NewStore = StoreMgr->SetSVal(OldStore, LV, V);
+ Store NewStore = StoreMgr->Bind(OldStore, LV, V);
if (NewStore == OldStore)
return St;
diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp
index 9053707..f936fff 100644
--- a/lib/Analysis/RegionStore.cpp
+++ b/lib/Analysis/RegionStore.cpp
@@ -38,8 +38,8 @@
virtual ~RegionStoreManager() {}
- SVal GetSVal(Store S, Loc L, QualType T);
- Store SetSVal(Store St, Loc LV, SVal V);
+ SVal Retrieve(Store S, Loc L, QualType T);
+ Store Bind(Store St, Loc LV, SVal V);
Store getInitialStore();
@@ -65,7 +65,7 @@
return loc::MemRegionVal(ER);
}
-SVal RegionStoreManager::GetSVal(Store S, Loc L, QualType T) {
+SVal RegionStoreManager::Retrieve(Store S, Loc L, QualType T) {
assert(!isa<UnknownVal>(L) && "location unknown");
assert(!isa<UndefinedVal>(L) && "location undefined");
@@ -97,7 +97,7 @@
}
}
-Store RegionStoreManager::SetSVal(Store store, Loc LV, SVal V) {
+Store RegionStoreManager::Bind(Store store, Loc LV, SVal V) {
assert(LV.getSubKind() == loc::MemRegionKind);
const MemRegion* R = cast<loc::MemRegionVal>(LV).getRegion();
@@ -135,7 +135,7 @@
? SVal::GetSymbolValue(StateMgr.getSymbolManager(), VD)
: UndefinedVal();
- St = SetSVal(St, getVarLoc(VD), X);
+ St = Bind(St, getVarLoc(VD), X);
}
}
}
@@ -160,16 +160,16 @@
QualType T = VD->getType();
if (Loc::IsLocType(T))
- store = SetSVal(store, getVarLoc(VD),
- loc::ConcreteInt(BasicVals.getValue(0, T)));
+ store = Bind(store, getVarLoc(VD),
+ loc::ConcreteInt(BasicVals.getValue(0, T)));
else if (T->isIntegerType())
- store = SetSVal(store, getVarLoc(VD),
- loc::ConcreteInt(BasicVals.getValue(0, T)));
+ store = Bind(store, getVarLoc(VD),
+ loc::ConcreteInt(BasicVals.getValue(0, T)));
else
assert("ignore other types of variables");
} else {
- store = SetSVal(store, getVarLoc(VD), InitVal);
+ store = Bind(store, getVarLoc(VD), InitVal);
}
}
} else {
@@ -186,7 +186,7 @@
? cast<SVal>(loc::SymbolVal(Sym))
: cast<SVal>(nonloc::SymbolVal(Sym));
}
- store = SetSVal(store, getVarLoc(VD), V);
+ store = Bind(store, getVarLoc(VD), V);
} else if (T->isArrayType()) {
// Only handle constant size array.
@@ -197,7 +197,7 @@
for (llvm::APInt i = llvm::APInt::getNullValue(Size.getBitWidth());
i != Size; ++i) {
nonloc::ConcreteInt Idx(BasicVals.getValue(llvm::APSInt(i)));
- store = SetSVal(store, getElementLoc(VD, Idx), UndefinedVal());
+ store = Bind(store, getElementLoc(VD, Idx), UndefinedVal());
}
}
} else if (T->isStructureType()) {