diff options
| author | Sam McCall <sam.mccall@gmail.com> | 2018-05-30 14:14:58 +0000 |
|---|---|---|
| committer | Sam McCall <sam.mccall@gmail.com> | 2018-05-30 14:14:58 +0000 |
| commit | 5429bd751cc0729a3b2f49d8c346aa288cd8d2fc (patch) | |
| tree | ecb7a8e0a08efc304285a887cc295f5915ffad96 /clang/lib/Sema/SemaStmt.cpp | |
| parent | 173e225f1c2f601536f2e625c05e46fe99ca22b1 (diff) | |
| download | bcm5719-llvm-5429bd751cc0729a3b2f49d8c346aa288cd8d2fc.tar.gz bcm5719-llvm-5429bd751cc0729a3b2f49d8c346aa288cd8d2fc.zip | |
Revert "Update NRVO logic to support early return"
This reverts commit r333500, which causes stage2 compiler crashes.
llvm-svn: 333547
Diffstat (limited to 'clang/lib/Sema/SemaStmt.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaStmt.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp index 04f51145104..ccf25ee9ebe 100644 --- a/clang/lib/Sema/SemaStmt.cpp +++ b/clang/lib/Sema/SemaStmt.cpp @@ -3455,9 +3455,12 @@ Sema::ActOnReturnStmt(SourceLocation ReturnLoc, Expr *RetValExp, ExpressionEvaluationContext::DiscardedStatement) return R; - VarDecl *VD = - const_cast<VarDecl*>(cast<ReturnStmt>(R.get())->getNRVOCandidate()); - CurScope->setNRVOCandidate(VD); + if (VarDecl *VD = + const_cast<VarDecl*>(cast<ReturnStmt>(R.get())->getNRVOCandidate())) { + CurScope->addNRVOCandidate(VD); + } else { + CurScope->setNoNRVO(); + } CheckJumpOutOfSEHFinally(*this, ReturnLoc, *CurScope->getFnParent()); |
