commit 96f8c5c420df383e61fe61bf67fc73a3ef8aab75
author Eric Fiselier <eric@efcs.ca> Tue Jan 30 00:32:25 2018 +0000
committer Eric Fiselier <eric@efcs.ca> Tue Jan 30 00:32:25 2018 +0000
tree b4d0bce5e948fa587b1f39de691fdeddfac53f01
parent 83f056604c5cc2066cace35575ff04e387b36bf5

Revert "[coroutines] Fix application of NRVO to Coroutine "Gro" or return object."

This reverts commit r323712. It's causing some test failures on certain machines.
Not sure why, will investigate.

llvm-svn: 323717

clang/lib/Sema/SemaCoroutine.cpp

diff --git a/clang/lib/Sema/SemaCoroutine.cpp b/clang/lib/Sema/SemaCoroutine.cpp
index 67c8b9b..f05a94e 100644
--- a/clang/lib/Sema/SemaCoroutine.cpp
+++ b/clang/lib/Sema/SemaCoroutine.cpp
@@ -1316,6 +1316,10 @@
   if (Res.isInvalid())
     return false;
 
+  if (GroType == FnRetType) {
+    GroDecl->setNRVOVariable(true);
+  }
+
   S.AddInitializerToDecl(GroDecl, Res.get(),
                          /*DirectInit=*/false);
 
@@ -1339,8 +1343,6 @@
     noteMemberDeclaredHere(S, ReturnValue, Fn);
     return false;
   }
-  if (cast<clang::ReturnStmt>(ReturnStmt.get())->getNRVOCandidate() == GroDecl)
-    GroDecl->setNRVOVariable(true);
 
   this->ReturnStmt = ReturnStmt.get();
   return true;