diff options
author | Zhongxing Xu <xuzhongxing@gmail.com> | 2009-05-09 04:08:27 +0000 |
---|---|---|
committer | Zhongxing Xu <xuzhongxing@gmail.com> | 2009-05-09 04:08:27 +0000 |
commit | d9b6ad609ef0b90527e848ba69dc2e492771be4f (patch) | |
tree | fe1fc0ebf39cf16920dbd31bae53fdd01be12108 /lib | |
parent | a82d8aa5b3b3d24998b4d98b9f45a43cc84cac6f (diff) |
Rename:
SymbolRegionRValue => SymbolRegionValue
SymExpr::RegionRValue => SymExpr::RegionValueKind
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@71322 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Analysis/BasicStore.cpp | 4 | ||||
-rw-r--r-- | lib/Analysis/RegionStore.cpp | 6 | ||||
-rw-r--r-- | lib/Analysis/SVals.cpp | 4 | ||||
-rw-r--r-- | lib/Analysis/SymbolManager.cpp | 18 |
4 files changed, 16 insertions, 16 deletions
diff --git a/lib/Analysis/BasicStore.cpp b/lib/Analysis/BasicStore.cpp index b9eeb9f8bc..2dd46c3853 100644 --- a/lib/Analysis/BasicStore.cpp +++ b/lib/Analysis/BasicStore.cpp @@ -487,7 +487,7 @@ Store BasicStoreManager::scanForIvars(Stmt *B, const Decl* SelfDecl, Store St) { if (DR->getDecl() == SelfDecl) { const MemRegion *IVR = MRMgr.getObjCIvarRegion(IV->getDecl(), SelfRegion); - SVal X = ValMgr.getRValueSymbolVal(IVR); + SVal X = ValMgr.getRegionValueSymbolVal(IVR); St = BindInternal(St, Loc::MakeVal(IVR), X); } } @@ -543,7 +543,7 @@ Store BasicStoreManager::getInitialStore() { const MemRegion *R = StateMgr.getRegion(VD); SVal X = (VD->hasGlobalStorage() || isa<ParmVarDecl>(VD) || isa<ImplicitParamDecl>(VD)) - ? ValMgr.getRValueSymbolVal(R) + ? ValMgr.getRegionValueSymbolVal(R) : UndefinedVal(); St = BindInternal(St, Loc::MakeVal(R), X); diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp index 6e9a1a684d..a23a47ecc8 100644 --- a/lib/Analysis/RegionStore.cpp +++ b/lib/Analysis/RegionStore.cpp @@ -824,7 +824,7 @@ SVal RegionStoreManager::Retrieve(const GRState* St, Loc L, QualType T) { if (SR == SelfRegion) { // FIXME: Do we need to handle the case where the super region // has a view? We want to canonicalize the bindings. - return ValMgr.getRValueSymbolVal(R); + return ValMgr.getRegionValueSymbolVal(R); } // Otherwise, we need a new symbol. For now return Unknown. @@ -846,7 +846,7 @@ SVal RegionStoreManager::Retrieve(const GRState* St, Loc L, QualType T) { VD->hasGlobalStorage()) { QualType VTy = VD->getType(); if (Loc::IsLocType(VTy) || VTy->isIntegerType()) - return ValMgr.getRValueSymbolVal(VR); + return ValMgr.getRegionValueSymbolVal(VR); else return UnknownVal(); } @@ -862,7 +862,7 @@ SVal RegionStoreManager::Retrieve(const GRState* St, Loc L, QualType T) { // All other integer values are symbolic. if (Loc::IsLocType(RTy) || RTy->isIntegerType()) - return ValMgr.getRValueSymbolVal(R); + return ValMgr.getRegionValueSymbolVal(R); else return UnknownVal(); } diff --git a/lib/Analysis/SVals.cpp b/lib/Analysis/SVals.cpp index 58a0b80aa6..e10ea8952a 100644 --- a/lib/Analysis/SVals.cpp +++ b/lib/Analysis/SVals.cpp @@ -297,8 +297,8 @@ NonLoc NonLoc::MakeCompoundVal(QualType T, llvm::ImmutableList<SVal> Vals, return nonloc::CompoundVal(BasicVals.getCompoundValData(T, Vals)); } -SVal ValueManager::getRValueSymbolVal(const MemRegion* R) { - SymbolRef sym = SymMgr.getRegionRValueSymbol(R); +SVal ValueManager::getRegionValueSymbolVal(const MemRegion* R) { + SymbolRef sym = SymMgr.getRegionValueSymbol(R); if (const TypedRegion* TR = dyn_cast<TypedRegion>(R)) { QualType T = TR->getValueType(SymMgr.getContext()); diff --git a/lib/Analysis/SymbolManager.cpp b/lib/Analysis/SymbolManager.cpp index 84019fd8d5..5c885cd6e1 100644 --- a/lib/Analysis/SymbolManager.cpp +++ b/lib/Analysis/SymbolManager.cpp @@ -65,7 +65,7 @@ static void print(llvm::raw_ostream& os, const SymSymExpr *SE) { static void print(llvm::raw_ostream& os, const SymExpr *SE) { switch (SE->getKind()) { case SymExpr::BEGIN_SYMBOLS: - case SymExpr::RegionRValue: + case SymExpr::RegionValueKind: case SymExpr::ConjuredKind: case SymExpr::END_SYMBOLS: os << '$' << cast<SymbolData>(SE)->getSymbolID(); @@ -91,20 +91,20 @@ std::ostream& std::operator<<(std::ostream& os, const SymExpr *SE) { return os; } -const SymbolRegionRValue* -SymbolManager::getRegionRValueSymbol(const MemRegion* R) { +const SymbolRegionValue* +SymbolManager::getRegionValueSymbol(const MemRegion* R) { llvm::FoldingSetNodeID profile; - SymbolRegionRValue::Profile(profile, R); + SymbolRegionValue::Profile(profile, R); void* InsertPos; SymExpr *SD = DataSet.FindNodeOrInsertPos(profile, InsertPos); if (!SD) { - SD = (SymExpr*) BPAlloc.Allocate<SymbolRegionRValue>(); - new (SD) SymbolRegionRValue(SymbolCounter, R); + SD = (SymExpr*) BPAlloc.Allocate<SymbolRegionValue>(); + new (SD) SymbolRegionValue(SymbolCounter, R); DataSet.InsertNode(SD, InsertPos); ++SymbolCounter; } - return cast<SymbolRegionRValue>(SD); + return cast<SymbolRegionValue>(SD); } const SymbolConjured* @@ -165,7 +165,7 @@ QualType SymbolConjured::getType(ASTContext&) const { return T; } -QualType SymbolRegionRValue::getType(ASTContext& C) const { +QualType SymbolRegionValue::getType(ASTContext& C) const { if (const TypedRegion* TR = dyn_cast<TypedRegion>(R)) return TR->getValueType(C); @@ -197,7 +197,7 @@ bool SymbolReaper::isLive(SymbolRef sym) { // Interogate the symbol. It may derive from an input value to // the analyzed function/method. - return isa<SymbolRegionRValue>(sym); + return isa<SymbolRegionValue>(sym); } SymbolVisitor::~SymbolVisitor() {} |