diff options
author | Eric Fiselier <eric@efcs.ca> | 2018-01-29 23:52:57 +0000 |
---|---|---|
committer | Eric Fiselier <eric@efcs.ca> | 2018-01-29 23:52:57 +0000 |
commit | 82aa86f5d3a79abcdd363475d1509c564c178126 (patch) | |
tree | df02cb092bbb4c169e12b50344a6295f78b1edc1 /lib/Sema/SemaCoroutine.cpp | |
parent | 44c0f4cce21bb2ea020b6dfb45fa8b2682a45278 (diff) | |
download | clang-82aa86f5d3a79abcdd363475d1509c564c178126.tar.gz |
[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
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@323712 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaCoroutine.cpp')
-rw-r--r-- | lib/Sema/SemaCoroutine.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Sema/SemaCoroutine.cpp b/lib/Sema/SemaCoroutine.cpp index f05a94ebe0..67c8b9b1a7 100644 --- a/lib/Sema/SemaCoroutine.cpp +++ b/lib/Sema/SemaCoroutine.cpp @@ -1316,10 +1316,6 @@ bool CoroutineStmtBuilder::makeGroDeclAndReturnStmt() { if (Res.isInvalid()) return false; - if (GroType == FnRetType) { - GroDecl->setNRVOVariable(true); - } - S.AddInitializerToDecl(GroDecl, Res.get(), /*DirectInit=*/false); @@ -1343,6 +1339,8 @@ 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; |