Do not add elidable CXXConstructExpr as block-level expr.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@118165 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Analysis/CFG.cpp b/lib/Analysis/CFG.cpp
index 5dcbe98c2701f1412f4a87c056787dd3d1d989ff..ef67d3b9576bb7575127361ef6cf9f3773325530 100644 (file)
--- a/lib/Analysis/CFG.cpp
+++ b/lib/Analysis/CFG.cpp
@@ -2392,7 +2392,8 @@ CFGBlock *CFGBuilder::VisitCXXConstructExpr(CXXConstructExpr *C,
   AddStmtChoice::Kind K = asc.asLValue() ? AddStmtChoice::AlwaysAddAsLValue
                                          : AddStmtChoice::AlwaysAdd;
   autoCreateBlock();
-  AppendStmt(Block, C, AddStmtChoice(K));
+  if (!C->isElidable())
+    AppendStmt(Block, C, AddStmtChoice(K));
   return VisitChildren(C);
 }