From a804a68f5a1ad739eb17ff2fd942d12abbc30b08 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Tue, 2 Mar 2010 21:43:52 +0000 Subject: [PATCH] Don't conjure a symbol for DeclStmts when the variable is a C++ reference. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@97590 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Checker/GRExprEngine.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Checker/GRExprEngine.cpp b/lib/Checker/GRExprEngine.cpp index 964f7fac89..ad229c7b8f 100644 --- a/lib/Checker/GRExprEngine.cpp +++ b/lib/Checker/GRExprEngine.cpp @@ -2358,8 +2358,9 @@ void GRExprEngine::VisitDeclStmt(DeclStmt *DS, ExplodedNode *Pred, // Recover some path-sensitivity if a scalar value evaluated to // UnknownVal. - if (InitVal.isUnknown() || - !getConstraintManager().canReasonAbout(InitVal)) { + if ((InitVal.isUnknown() || + !getConstraintManager().canReasonAbout(InitVal)) && + !VD->getType()->isReferenceType()) { InitVal = ValMgr.getConjuredSymbolVal(NULL, InitEx, Builder->getCurrentBlockCount()); } @@ -2901,9 +2902,8 @@ void GRExprEngine::VisitReturnStmt(ReturnStmt *RS, ExplodedNode *Pred, if (Expr *RetE = RS->getRetValue()) { // Record the returned expression in the state. { - static int Tag; - SaveAndRestore OldTag(Builder->Tag); - Builder->Tag = &Tag; + static int Tag = 0; + SaveAndRestore OldTag(Builder->Tag, &Tag); const GRState *state = GetState(Pred); state = state->set(RetE); Pred = Builder->generateNode(RetE, state, Pred); -- 2.50.1