commit 3be68e162ffbf992c2efbc70983d27c05739a8b0
author Taiju Tsuiki <tzik@google.com> Tue Jun 19 05:35:30 2018 +0000
committer Taiju Tsuiki <tzik@google.com> Tue Jun 19 05:35:30 2018 +0000
tree ce47a7000d746109fb539ef4741b57eea3295118
parent ea798aa7f596060d4be4e3c6bcadcda77a63829e

Revert r335019 "Update NRVO logic to support early return (Attempt 2)"

llvm-svn: 335022

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 7e38dcc..68857d9 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -740,13 +740,12 @@
   SemaRef.BuildVariableInstantiation(Var, D, TemplateArgs, LateAttrs, Owner,
                                      StartingScope, InstantiatingVarTemplate);
 
-  bool NRVO = false;
   if (D->isNRVOVariable()) {
     QualType ReturnType = cast<FunctionDecl>(DC)->getReturnType();
     if (SemaRef.isCopyElisionCandidate(ReturnType, Var, Sema::CES_Strict))
-      NRVO = true;
+      Var->setNRVOVariable(true);
   }
-  Var->setNRVOVariable(NRVO);
+
   Var->setImplicit(D->isImplicit());
 
   return Var;