diff options
author | Sebastian Redl <sebastian.redl@getdesigned.at> | 2012-03-14 15:54:00 +0000 |
---|---|---|
committer | Sebastian Redl <sebastian.redl@getdesigned.at> | 2012-03-14 15:54:00 +0000 |
commit | 84407ba82a10235962901ce269b7b3276d17f01d (patch) | |
tree | 59909c6c427e91e6b771bc0d042167cd2fe289ed /lib/Parse/ParseCXXInlineMethods.cpp | |
parent | e5049d29f74183d88a332ce4868e84a9c12893f0 (diff) |
Parse brace initializers as default arguments. PR12236.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152721 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseCXXInlineMethods.cpp')
-rw-r--r-- | lib/Parse/ParseCXXInlineMethods.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/Parse/ParseCXXInlineMethods.cpp b/lib/Parse/ParseCXXInlineMethods.cpp index 7ee74ecc76..8a6e1ce33f 100644 --- a/lib/Parse/ParseCXXInlineMethods.cpp +++ b/lib/Parse/ParseCXXInlineMethods.cpp @@ -319,7 +319,11 @@ void Parser::ParseLexedMethodDeclaration(LateParsedMethodDeclaration &LM) { Sema::PotentiallyEvaluatedIfUsed, LM.DefaultArgs[I].Param); - ExprResult DefArgResult(ParseAssignmentExpression()); + ExprResult DefArgResult; + if (Tok.is(tok::l_brace)) + DefArgResult = ParseBraceInitializer(); + else + DefArgResult = ParseAssignmentExpression(); if (DefArgResult.isInvalid()) Actions.ActOnParamDefaultArgumentError(LM.DefaultArgs[I].Param); else { |