From 2b71f2cb4db520bc83b10e621d17142ed96d1540 Mon Sep 17 00:00:00 2001 From: John McCall Date: Wed, 6 Jan 2016 23:34:20 +0000 Subject: [PATCH] Properly bind up any cleanups in an ExprWithCleanups after instantiating a default argument expression. This was previously just working implicitly by reinstantiating in the current context, but caching means that we weren't registering cleanups in subsequent uses. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@256996 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaExpr.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index f1b9987a2f..8e50d5a103 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -4313,17 +4313,16 @@ ExprResult Sema::BuildCXXDefaultArgExpr(SourceLocation CallLoc, if (Result.isInvalid()) return ExprError(); - Expr *Arg = Result.getAs(); - CheckCompletedExpr(Arg, Param->getOuterLocStart()); + Result = ActOnFinishFullExpr(Result.getAs(), + Param->getOuterLocStart()); + if (Result.isInvalid()) + return ExprError(); // Remember the instantiated default argument. - Param->setDefaultArg(Arg); + Param->setDefaultArg(Result.getAs()); if (ASTMutationListener *L = getASTMutationListener()) { L->DefaultArgumentInstantiated(Param); } - - // Build the default argument expression. - return CXXDefaultArgExpr::Create(Context, CallLoc, Param); } // If the default expression creates temporaries, we need to -- 2.40.0