diff options
| -rw-r--r-- | include/clang/Analysis/PathSensitive/ValueManager.h | 2 | ||||
| -rw-r--r-- | lib/Analysis/GRExprEngine.cpp | 3 | ||||
| -rw-r--r-- | lib/Analysis/RegionStore.cpp | 6 | ||||
| -rw-r--r-- | lib/Analysis/SVals.cpp | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/include/clang/Analysis/PathSensitive/ValueManager.h b/include/clang/Analysis/PathSensitive/ValueManager.h index e6279a3df9..db2f727031 100644 --- a/include/clang/Analysis/PathSensitive/ValueManager.h +++ b/include/clang/Analysis/PathSensitive/ValueManager.h @@ -90,7 +90,7 @@ public: NonLoc makeNonLoc(SymbolRef sym); - NonLoc makeNonLoc(const llvm::APSInt& V); + NonLoc makeIntVal(const llvm::APSInt& V); NonLoc makeNonLoc(const SymExpr *lhs, BinaryOperator::Opcode op, const llvm::APSInt& rhs, QualType T); diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp index 87432d4815..52175ee2a0 100644 --- a/lib/Analysis/GRExprEngine.cpp +++ b/lib/Analysis/GRExprEngine.cpp @@ -944,8 +944,7 @@ void GRExprEngine::VisitDeclRefExpr(DeclRefExpr* Ex, NodeTy* Pred, NodeSet& Dst, } else if (const EnumConstantDecl* ED = dyn_cast<EnumConstantDecl>(D)) { assert(!asLValue && "EnumConstantDecl does not have lvalue."); - BasicValueFactory& BasicVals = StateMgr.getBasicVals(); - SVal V = nonloc::ConcreteInt(BasicVals.getValue(ED->getInitVal())); + SVal V = ValMgr.makeIntVal(ED->getInitVal()); MakeNode(Dst, Ex, Pred, state->bindExpr(Ex, V)); return; diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp index 0d0f83d71c..f0374bd231 100644 --- a/lib/Analysis/RegionStore.cpp +++ b/lib/Analysis/RegionStore.cpp @@ -1100,7 +1100,7 @@ const GRState *RegionStoreManager::BindArray(const GRState *state, if (j >= len) break; - SVal Idx = ValMgr.makeNonLoc(i); + SVal Idx = ValMgr.makeIntVal(i); ElementRegion* ER = MRMgr.getElementRegion(ElementTy, Idx,R,getContext()); SVal V = NonLoc::MakeVal(getBasicVals(), str[j], sizeof(char)*8, true); @@ -1118,7 +1118,7 @@ const GRState *RegionStoreManager::BindArray(const GRState *state, if (VI == VE) break; - SVal Idx = ValMgr.makeNonLoc(i); + SVal Idx = ValMgr.makeIntVal(i); ElementRegion* ER = MRMgr.getElementRegion(ElementTy, Idx, R, getContext()); if (CAT->getElementType()->isStructureType()) @@ -1131,7 +1131,7 @@ const GRState *RegionStoreManager::BindArray(const GRState *state, // to 0. if (ElementTy->isIntegerType()) { while (i < Size) { - SVal Idx = ValMgr.makeNonLoc(i); + SVal Idx = ValMgr.makeIntVal(i); ElementRegion* ER = MRMgr.getElementRegion(ElementTy, Idx,R,getContext()); SVal V = ValMgr.makeZeroVal(ElementTy); state = Bind(state, Loc::MakeVal(ER), V); diff --git a/lib/Analysis/SVals.cpp b/lib/Analysis/SVals.cpp index e33275199a..38e1601a42 100644 --- a/lib/Analysis/SVals.cpp +++ b/lib/Analysis/SVals.cpp @@ -264,7 +264,7 @@ NonLoc ValueManager::makeNonLoc(SymbolRef sym) { return nonloc::SymbolVal(sym); } -NonLoc ValueManager::makeNonLoc(const APSInt& V) { +NonLoc ValueManager::makeIntVal(const APSInt& V) { return nonloc::ConcreteInt(BasicVals.getValue(V)); } |