From facfffcd4e3aeed627909e59f0d6555d91140a9f Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Tue, 30 Jan 2018 00:32:25 +0000
Subject: [PATCH] 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.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@323717 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Sema/SemaCoroutine.cpp               |  6 +-
 test/CodeGenCoroutines/coro-alloc.cpp    |  8 +--
 test/CodeGenCoroutines/coro-gro-nrvo.cpp | 80 ------------------------
 3 files changed, 5 insertions(+), 89 deletions(-)
 delete mode 100644 test/CodeGenCoroutines/coro-gro-nrvo.cpp

diff --git a/lib/Sema/SemaCoroutine.cpp b/lib/Sema/SemaCoroutine.cpp
index 67c8b9b1a7..f05a94ebe0 100644
--- a/lib/Sema/SemaCoroutine.cpp
+++ b/lib/Sema/SemaCoroutine.cpp
@@ -1316,6 +1316,10 @@ bool CoroutineStmtBuilder::makeGroDeclAndReturnStmt() {
   if (Res.isInvalid())
     return false;
 
+  if (GroType == FnRetType) {
+    GroDecl->setNRVOVariable(true);
+  }
+
   S.AddInitializerToDecl(GroDecl, Res.get(),
                          /*DirectInit=*/false);
 
@@ -1339,8 +1343,6 @@ bool CoroutineStmtBuilder::makeGroDeclAndReturnStmt() {
     noteMemberDeclaredHere(S, ReturnValue, Fn);
     return false;
   }
-  if (cast<clang::ReturnStmt>(ReturnStmt.get())->getNRVOCandidate() == GroDecl)
-    GroDecl->setNRVOVariable(true);
 
   this->ReturnStmt = ReturnStmt.get();
   return true;
diff --git a/test/CodeGenCoroutines/coro-alloc.cpp b/test/CodeGenCoroutines/coro-alloc.cpp
index 794799c19d..820201db35 100644
--- a/test/CodeGenCoroutines/coro-alloc.cpp
+++ b/test/CodeGenCoroutines/coro-alloc.cpp
@@ -173,7 +173,6 @@ struct std::experimental::coroutine_traits<int, promise_on_alloc_failure_tag> {
 // CHECK-LABEL: f4(
 extern "C" int f4(promise_on_alloc_failure_tag) {
   // CHECK: %[[RetVal:.+]] = alloca i32
-  // CHECK: %[[Gro:.+]] = alloca i32
   // CHECK: %[[ID:.+]] = call token @llvm.coro.id(i32 16
   // CHECK: %[[SIZE:.+]] = call i64 @llvm.coro.size.i64()
   // CHECK: %[[MEM:.+]] = call i8* @_ZnwmRKSt9nothrow_t(i64 %[[SIZE]], %"struct.std::nothrow_t"* dereferenceable(1) @_ZStL7nothrow)
@@ -187,12 +186,7 @@ extern "C" int f4(promise_on_alloc_failure_tag) {
 
   // CHECK: [[OKBB]]:
   // CHECK:   %[[OkRet:.+]] = call i32 @_ZNSt12experimental16coroutine_traitsIJi28promise_on_alloc_failure_tagEE12promise_type17get_return_objectEv(
-  // CHECK:   store i32 %[[OkRet]], i32* %[[Gro]]
-
-  // CHECK: coro.ret:
-  // CHECK: %[[Tmp1:.*]] = load i32, i32* %[[Gro]]
-  // CHECK-NEXT: store i32 %[[Tmp1]], i32* %[[RetVal]]
-  // CHECK-NEXT: br label %[[RetBB]]
+  // CHECK:   store i32 %[[OkRet]], i32* %[[RetVal]]
 
   // CHECK: [[RetBB]]:
   // CHECK:   %[[LoadRet:.+]] = load i32, i32* %[[RetVal]], align 4
diff --git a/test/CodeGenCoroutines/coro-gro-nrvo.cpp b/test/CodeGenCoroutines/coro-gro-nrvo.cpp
deleted file mode 100644
index 13964b2b50..0000000000
--- a/test/CodeGenCoroutines/coro-gro-nrvo.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fcoroutines-ts -std=c++14 -emit-llvm %s -o - -disable-llvm-passes | FileCheck %s
-
-#include "Inputs/coroutine.h"
-
-using namespace std::experimental;
-
-namespace std {
-
-struct nothrow_t {};
-constexpr nothrow_t nothrow = {};
-
-} // end namespace std
-
-// Required when get_return_object_on_allocation_failure() is defined by
-// the promise.
-void* operator new(__SIZE_TYPE__ __sz, const std::nothrow_t&) noexcept;
-void  operator delete(void* __p, const std::nothrow_t&) noexcept;
-
-
-template <class RetObject>
-struct promise_type {
-    RetObject get_return_object();
-    suspend_always initial_suspend();
-    suspend_never final_suspend();
-    void return_void();
-    static void unhandled_exception();
-};
-
-struct coro {
-  using promise_type = promise_type<coro>;
-  coro(coro const&);
-  struct Impl;
-  Impl *impl;
-};
-
-// Verify that the NRVO is applied to the Gro object.
-// CHECK-LABEL: define void @_Z1fi(%struct.coro* noalias sret %agg.result, i32)
-coro f(int) {
-// CHECK: coro.init:
-// CHECK: store i1 false, i1* %gro.active
-// CHECK-NEXT: call void @{{.*get_return_objectEv}}(%struct.coro* sret %agg.result
-// CHECK-NEXT: store i1 true, i1* %gro.active
-  co_return;
-}
-
-
-template <class RetObject>
-struct promise_type_with_on_alloc_failure {
-    static RetObject get_return_object_on_allocation_failure();
-    RetObject get_return_object();
-    suspend_always initial_suspend();
-    suspend_never final_suspend();
-    void return_void();
-    static void unhandled_exception();
-};
-
-struct coro_two {
-  using promise_type = promise_type_with_on_alloc_failure<coro_two>;
-  coro_two(coro_two const&);
-  struct Impl;
-  Impl *impl;
-};
-
-// Verify that the NRVO is applied to the Gro object.
-// CHECK-LABEL: define void @_Z1hi(%struct.coro_two* noalias sret %agg.result, i32)
- coro_two h(int) {
-
-// CHECK: coro.ret.on.failure:
-// CHECK-NEXT: call void @{{.*get_return_object_on_allocation_failureEv}}(%struct.coro_two* sret %agg.result
-// CHECK-NEXT: br label %[[RetLabel:.*]]
-
-// CHECK: coro.init:
-// CHECK: store i1 false, i1* %gro.active
-// CHECK-NEXT: call void @{{.*get_return_objectEv}}(%struct.coro_two* sret %agg.result
-// CHECK-NEXT: store i1 true, i1* %gro.active
-
-// CHECK: [[RetLabel]]:
-// CHECK-NEXT: ret void
-  co_return;
-}
-- 
2.40.0