diff options
Diffstat (limited to 'lib/Parse/ParseInit.cpp')
-rw-r--r-- | lib/Parse/ParseInit.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/Parse/ParseInit.cpp b/lib/Parse/ParseInit.cpp index 9b93c18795..ff73b0b9e1 100644 --- a/lib/Parse/ParseInit.cpp +++ b/lib/Parse/ParseInit.cpp @@ -253,8 +253,8 @@ Parser::OwningExprResult Parser::ParseBraceInitializer() { if (Tok.is(tok::r_brace)) { Diag(LBraceLoc, diag::ext_gnu_empty_initializer); // Match the '}'. - return Owned(Actions.ActOnInitList(LBraceLoc, 0, 0, InitExprDesignations, - ConsumeBrace())); + return Actions.ActOnInitList(LBraceLoc, Action::MultiExprArg(Actions), + InitExprDesignations, ConsumeBrace()); } bool InitExprsOk = true; @@ -309,9 +309,8 @@ Parser::OwningExprResult Parser::ParseBraceInitializer() { if (Tok.is(tok::r_brace)) break; } if (InitExprsOk && Tok.is(tok::r_brace)) - return Owned(Actions.ActOnInitList(LBraceLoc, InitExprs.take(), - InitExprs.size(), - InitExprDesignations, ConsumeBrace())); + return Actions.ActOnInitList(LBraceLoc, move_arg(InitExprs), + InitExprDesignations, ConsumeBrace()); // Match the '}'. MatchRHSPunctuation(tok::r_brace, LBraceLoc); |