1 files changed, 2 insertions, 8 deletions
diff --git a/clang/lib/Analysis/GRExprEngine.cpp b/clang/lib/Analysis/GRExprEngine.cpp
index 3809d593cfd..7abb1a42623 100644
--- a/clang/lib/Analysis/GRExprEngine.cpp
+++ b/clang/lib/Analysis/GRExprEngine.cpp
@@ -2138,14 +2138,8 @@ void GRExprEngine::VisitDeclStmt(DeclStmt* DS, NodeTy* Pred, NodeSet& Dst) {
       // UnknownVal.
       if (InitVal.isUnknown() || 
           !getConstraintManager().canReasonAbout(InitVal)) {
-        if (Loc::IsLocType(T)) {
-          SymbolRef Sym = SymMgr.getConjuredSymbol(InitEx, Count);        
-          InitVal = loc::SymbolVal(Sym);
-        }
-        else if (T->isIntegerType() && T->isScalarType()) {
-          SymbolRef Sym = SymMgr.getConjuredSymbol(InitEx, Count);        
-          InitVal = nonloc::SymbolVal(Sym);                    
-        }
+        InitVal = SVal::GetConjuredSymbolVal(SymMgr, 
+                          getStoreManager().getRegionManager(), InitEx, Count);
       }        
       
       state = StateMgr.BindDecl(state, VD, InitVal);