[cfe-commits] r160845 - /cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp

[Jordan Rose]

Author: jrose
Date: Thu Jul 26 19:47:52 2012
New Revision: 160845

URL: http://llvm.org/viewvc/llvm-project?rev=160845&view=rev
Log:
[analyzer] Use a stack-based local AGAIN to fix the build for real.

It's a good thing CallEvents aren't created all over the place yet.
I checked all the uses this time and the private copy constructor
/really/ shouldn't cause any more problems.

Modified:
    cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp

Modified: cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp?rev=160845&r1=160844&r2=160845&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp Thu Jul 26 19:47:52 2012
@@ -400,21 +400,26 @@
 
     // Evaluate the call.
     switch (K) {
-    case CE_Function:
-      evalCall(dstCallEvaluated, *I, FunctionCall(CE, State, LCtx));
+    case CE_Function: {
+      FunctionCall Call(CE, State, LCtx);
+      evalCall(dstCallEvaluated, *I, Call);
       break;
-    case CE_CXXMember:
-      evalCall(dstCallEvaluated, *I, CXXMemberCall(cast<CXXMemberCallExpr>(CE),
-                                                   State, LCtx));
+    }
+    case CE_CXXMember: {
+      CXXMemberCall Call(cast<CXXMemberCallExpr>(CE), State, LCtx);
+      evalCall(dstCallEvaluated, *I, Call);
       break;
-    case CE_CXXMemberOperator:
-      evalCall(dstCallEvaluated, *I,
-               CXXMemberOperatorCall(cast<CXXOperatorCallExpr>(CE),
-                                     State, LCtx));
+    }
+    case CE_CXXMemberOperator: {
+      CXXMemberOperatorCall Call(cast<CXXOperatorCallExpr>(CE), State, LCtx);
+      evalCall(dstCallEvaluated, *I, Call);
       break;
-    case CE_Block:
-      evalCall(dstCallEvaluated, *I, BlockCall(CE, State, LCtx));
+    }
+    case CE_Block: {
+      BlockCall Call(CE, State, LCtx);
+      evalCall(dstCallEvaluated, *I, Call);
       break;
+    }
     default:
       llvm_unreachable("Non-CallExpr CallEventKind");
     }