diff options
| author | Eric Fiselier <eric@efcs.ca> | 2018-02-01 23:47:54 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2018-02-01 23:47:54 +0000 |
| commit | 8ed97272ab5402e47113adcf03d83f7392e20d49 (patch) | |
| tree | 52566f529e3c0517abd598f058b5609753dfacd4 /clang/test/CodeGenCoroutines/coro-gro-nrvo.cpp | |
| parent | 17324d8b340dd9a3e22a94191b15ebf07a41fcc9 (diff) | |
| download | bcm5719-llvm-8ed97272ab5402e47113adcf03d83f7392e20d49.tar.gz bcm5719-llvm-8ed97272ab5402e47113adcf03d83f7392e20d49.zip | |
[coroutines] Fix application of NRVO to Coroutine "Gro" or return object.
Summary:
Fix NRVO for Gro variable.
Previously, we only marked the GRO declaration as an NRVO variable
when its QualType and the function return's QualType matched exactly
(using operator==). However, this was incorrect for two reasons:
1. We were marking non-class types, such as ints, as being NRVO variables.
2. We failed to handle cases where the canonical types were the same, but the actual `QualType` objects were different. For example, if one was represented by a typedef. (Example: https://godbolt.org/g/3UFgsL)
This patch fixes these bugs by marking the Gro variable as supporting NRVO only
when `BuildReturnStmt` marks the Gro variable as a coroutine candidate.
Reviewers: rsmith, GorNishanov, nicholas
Reviewed By: GorNishanov
Subscribers: majnemer, cfe-commits
Differential Revision: https://reviews.llvm.org/D42343
llvm-svn: 324037
Diffstat (limited to 'clang/test/CodeGenCoroutines/coro-gro-nrvo.cpp')
| -rw-r--r-- | clang/test/CodeGenCoroutines/coro-gro-nrvo.cpp | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/clang/test/CodeGenCoroutines/coro-gro-nrvo.cpp b/clang/test/CodeGenCoroutines/coro-gro-nrvo.cpp new file mode 100644 index 00000000000..45c5f675391 --- /dev/null +++ b/clang/test/CodeGenCoroutines/coro-gro-nrvo.cpp @@ -0,0 +1,87 @@ +// 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: %call = call i8* @_Znwm( +// CHECK-NEXT: br label %[[CoroInit:.*]] + +// CHECK: {{.*}}[[CoroInit]]: +// 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: %call = call i8* @_ZnwmRKSt9nothrow_t +// CHECK-NEXT: %[[CheckNull:.*]] = icmp ne i8* %call, null +// CHECK-NEXT: br i1 %[[CheckNull]], label %[[InitOnSuccess:.*]], label %[[InitOnFailure:.*]] + +// CHECK: {{.*}}[[InitOnFailure]]: +// CHECK-NEXT: call void @{{.*get_return_object_on_allocation_failureEv}}(%struct.coro_two* sret %agg.result +// CHECK-NEXT: br label %[[RetLabel:.*]] + +// CHECK: {{.*}}[[InitOnSuccess]]: +// 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; +} |

