commit 3be68e162ffbf992c2efbc70983d27c05739a8b0
author Taiju Tsuiki <tzik@google.com> Tue Jun 19 05:35:30 2018 +0000
committer Taiju Tsuiki <tzik@google.com> Tue Jun 19 05:35:30 2018 +0000
tree ce47a7000d746109fb539ef4741b57eea3295118
parent ea798aa7f596060d4be4e3c6bcadcda77a63829e

Revert r335019 "Update NRVO logic to support early return (Attempt 2)"

llvm-svn: 335022

clang/lib/Sema/SemaStmt.cpp

diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index 04f5114..ccf25ee 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/lib/Sema/SemaStmt.cpp
@@ -3455,9 +3455,12 @@
                            ExpressionEvaluationContext::DiscardedStatement)
     return R;
 
-  VarDecl *VD =
-      const_cast<VarDecl*>(cast<ReturnStmt>(R.get())->getNRVOCandidate());
-  CurScope->setNRVOCandidate(VD);
+  if (VarDecl *VD =
+      const_cast<VarDecl*>(cast<ReturnStmt>(R.get())->getNRVOCandidate())) {
+    CurScope->addNRVOCandidate(VD);
+  } else {
+    CurScope->setNoNRVO();
+  }
 
   CheckJumpOutOfSEHFinally(*this, ReturnLoc, *CurScope->getFnParent());