Improvements to CXXExprWithTemporaries in preparation for fixing a bug with default arguments that have temporaries.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72944 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 736a496..faf2571 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -1630,6 +1630,12 @@
TypeTy *Ty,
SourceLocation RParen);
+ /// MaybeCreateCXXExprWithTemporaries - If the list of temporaries is
+ /// non-empty, will create a new CXXExprWithTemporaries expression.
+ /// Otherwise, just returs the passed in expression.
+ Expr *MaybeCreateCXXExprWithTemporaries(Expr *SubExpr,
+ bool DestroyTemps = true);
+
virtual OwningExprResult ActOnFinishFullExpr(ExprArg Expr);
bool RequireCompleteDeclContext(const CXXScopeSpec &SS);
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 65018da..ed4ac55 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -1588,16 +1588,26 @@
return E;
}
+Expr *Sema::MaybeCreateCXXExprWithTemporaries(Expr *SubExpr,
+ bool DestroyTemps) {
+ assert(SubExpr && "sub expression can't be null!");
+
+ if (ExprTemporaries.empty())
+ return SubExpr;
+
+ Expr *E = CXXExprWithTemporaries::Create(Context, SubExpr,
+ &ExprTemporaries[0],
+ ExprTemporaries.size(),
+ DestroyTemps);
+ ExprTemporaries.clear();
+
+ return E;
+}
+
Sema::OwningExprResult Sema::ActOnFinishFullExpr(ExprArg Arg) {
Expr *FullExpr = Arg.takeAs<Expr>();
-
- if (FullExpr && !ExprTemporaries.empty()) {
- // Create a cleanup expr.
- FullExpr = CXXExprWithTemporaries::Create(Context, FullExpr,
- &ExprTemporaries[0],
- ExprTemporaries.size());
- ExprTemporaries.clear();
- }
+ if (FullExpr)
+ FullExpr = MaybeCreateCXXExprWithTemporaries(FullExpr);
return Owned(FullExpr);
}