diff options
| -rw-r--r-- | lib/Analysis/GRExprEngine.cpp | 13 | ||||
| -rw-r--r-- | lib/Analysis/SymbolManager.cpp | 3 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp index f0c0d8dd9e..a31c435786 100644 --- a/lib/Analysis/GRExprEngine.cpp +++ b/lib/Analysis/GRExprEngine.cpp @@ -202,10 +202,15 @@ const ValueState* GRExprEngine::getInitialState() { ScopedDecl *SD = const_cast<ScopedDecl*>(I->first); if (VarDecl* VD = dyn_cast<VarDecl>(SD)) { - if (VD->hasGlobalStorage() || isa<ParmVarDecl>(VD)) { - RVal X = RVal::GetSymbolValue(SymMgr, VD); - StateMgr.SetRVal(StateImpl, lval::DeclVal(VD), X); - } + // Initialize globals and parameters to symbolic values. + // Initialize local variables to undefined. + RVal X = (VD->hasGlobalStorage() || isa<ParmVarDecl>(VD) || + isa<ImplicitParamDecl>(VD)) + ? RVal::GetSymbolValue(SymMgr, VD) + : UndefinedVal(); + + StateMgr.SetRVal(StateImpl, lval::DeclVal(VD), X); + } else if (ImplicitParamDecl *IPD = dyn_cast<ImplicitParamDecl>(SD)) { RVal X = RVal::GetSymbolValue(SymMgr, IPD); StateMgr.SetRVal(StateImpl, lval::DeclVal(IPD), X); diff --git a/lib/Analysis/SymbolManager.cpp b/lib/Analysis/SymbolManager.cpp index f243fa667b..beb4379f99 100644 --- a/lib/Analysis/SymbolManager.cpp +++ b/lib/Analysis/SymbolManager.cpp @@ -18,7 +18,8 @@ using namespace clang; SymbolID SymbolManager::getSymbol(VarDecl* D) { - assert (isa<ParmVarDecl>(D) || D->hasGlobalStorage()); + assert (isa<ParmVarDecl>(D) || isa<ImplicitParamDecl>(D) || + D->hasGlobalStorage()); llvm::FoldingSetNodeID profile; |