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-alloc.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-alloc.cpp')
| -rw-r--r-- | clang/test/CodeGenCoroutines/coro-alloc.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/clang/test/CodeGenCoroutines/coro-alloc.cpp b/clang/test/CodeGenCoroutines/coro-alloc.cpp index 820201db357..e66561ae675 100644 --- a/clang/test/CodeGenCoroutines/coro-alloc.cpp +++ b/clang/test/CodeGenCoroutines/coro-alloc.cpp @@ -173,6 +173,7 @@ 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) @@ -186,7 +187,11 @@ 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* %[[RetVal]] + // CHECK: store i32 %[[OkRet]], i32* %[[Gro]] + + // CHECK: %[[Tmp1:.*]] = load i32, i32* %[[Gro]] + // CHECK-NEXT: store i32 %[[Tmp1]], i32* %[[RetVal]] + // CHECK-NEXT: br label %[[RetBB]] // CHECK: [[RetBB]]: // CHECK: %[[LoadRet:.+]] = load i32, i32* %[[RetVal]], align 4 |
