Create a symbolic region instead of a loc::SymbolVal. This is a continued step
to eliminate the use of loc::SymbolVal.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68685 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp
index 7e3fd45..1fb7e5d 100644
--- a/lib/Analysis/GRExprEngine.cpp
+++ b/lib/Analysis/GRExprEngine.cpp
@@ -2536,7 +2536,8 @@
// Conjure a new symbol if necessary to recover precision.
if (Result.isUnknown() || !getConstraintManager().canReasonAbout(Result))
- Result = SVal::GetConjuredSymbolVal(SymMgr, Ex,
+ Result = SVal::GetConjuredSymbolVal(SymMgr,
+ getStoreManager().getRegionManager(),Ex,
Builder->getCurrentBlockCount());
state = BindExpr(state, U, U->isPostfix() ? V2 : Result);
diff --git a/lib/Analysis/SVals.cpp b/lib/Analysis/SVals.cpp
index c5900b3..cf3e800 100644
--- a/lib/Analysis/SVals.cpp
+++ b/lib/Analysis/SVals.cpp
@@ -291,26 +291,23 @@
return Loc::MakeVal(MRMgr.getSymbolicRegion(sym));
// Only handle integers for now.
- if (T->isIntegerType())
+ if (T->isIntegerType() && T->isScalarType())
return NonLoc::MakeVal(sym);
}
return UnknownVal();
}
-SVal SVal::GetConjuredSymbolVal(SymbolManager &SymMgr, const Expr* E,
- unsigned Count) {
-
+SVal SVal::GetConjuredSymbolVal(SymbolManager &SymMgr, MemRegionManager& MRMgr,
+ const Expr* E, unsigned Count) {
QualType T = E->getType();
-
- if (Loc::IsLocType(T)) {
- SymbolRef Sym = SymMgr.getConjuredSymbol(E, Count);
- return loc::SymbolVal(Sym);
- }
- else if (T->isIntegerType() && T->isScalarType()) {
- SymbolRef Sym = SymMgr.getConjuredSymbol(E, Count);
- return nonloc::SymbolVal(Sym);
- }
+ SymbolRef sym = SymMgr.getConjuredSymbol(E, Count);
+
+ if (Loc::IsLocType(T))
+ return Loc::MakeVal(MRMgr.getSymbolicRegion(sym));
+
+ if (T->isIntegerType() && T->isScalarType())
+ return NonLoc::MakeVal(sym);
return UnknownVal();
}