From c76d7e3d96dc053865a7f334c41727346d67ec78 Mon Sep 17 00:00:00 2001 From: Jordan Rose Date: Thu, 2 May 2013 19:51:20 +0000 Subject: [analyzer] Don't try to evaluate MaterializeTemporaryExpr as a constant. ...and don't consider '0' to be a null pointer constant if it's the initializer for a float! Apparently null pointer constant evaluation looks through both MaterializeTemporaryExpr and ImplicitCastExpr, so we have to be more careful about types in the callers. For RegionStore this just means giving up a little more; for ExprEngine this means handling the MaterializeTemporaryExpr case explicitly. Follow-up to r180894. llvm-svn: 180944 --- clang/lib/StaticAnalyzer/Core/ExprEngine.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'clang/lib/StaticAnalyzer/Core/ExprEngine.cpp') diff --git a/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp b/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp index 0d5fb1785b3..bfe4e15a715 100644 --- a/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp +++ b/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp @@ -741,6 +741,13 @@ void ExprEngine::Visit(const Stmt *S, ExplodedNode *Pred, const CXXDefaultArgExpr *DefaultE = cast(S); const Expr *ArgE = DefaultE->getExpr(); + bool IsTemporary = false; + if (const MaterializeTemporaryExpr *MTE = + dyn_cast(ArgE)) { + ArgE = MTE->GetTemporaryExpr(); + IsTemporary = true; + } + Optional ConstantVal = svalBuilder.getConstantVal(ArgE); if (!ConstantVal) ConstantVal = UnknownVal(); @@ -749,7 +756,7 @@ void ExprEngine::Visit(const Stmt *S, ExplodedNode *Pred, I != E; ++I) { ProgramStateRef State = (*I)->getState(); State = State->BindExpr(DefaultE, LCtx, *ConstantVal); - if (DefaultE->isGLValue()) + if (IsTemporary) State = createTemporaryRegionIfNeeded(State, LCtx, DefaultE, DefaultE); Bldr2.generateNode(S, *I, State); -- cgit v1.2.3