summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseObjc.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2013-04-18 23:43:21 +0000
committerFariborz Jahanian <fjahanian@apple.com>2013-04-18 23:43:21 +0000
commitd5d6f3d5a241ac6414803b4a1ab5d0acb0b754b9 (patch)
treed413b9f28c142ca681a16ccbaba673e04d90adb6 /clang/lib/Parse/ParseObjc.cpp
parent3b21eb69fb6b895de91e2859fc7a5c95ef2dd6a8 (diff)
downloadbcm5719-llvm-d5d6f3d5a241ac6414803b4a1ab5d0acb0b754b9.tar.gz
bcm5719-llvm-d5d6f3d5a241ac6414803b4a1ab5d0acb0b754b9.zip
Objective-C++: Enable passing of modern C++11 style
initialized temporaries to objc++ methods. // rdar://12788429 llvm-svn: 179818
Diffstat (limited to 'clang/lib/Parse/ParseObjc.cpp')
-rw-r--r--clang/lib/Parse/ParseObjc.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseObjc.cpp b/clang/lib/Parse/ParseObjc.cpp
index 4adba4f5c55..23afa4ff3de 100644
--- a/clang/lib/Parse/ParseObjc.cpp
+++ b/clang/lib/Parse/ParseObjc.cpp
@@ -2501,7 +2501,14 @@ Parser::ParseObjCMessageExpressionBody(SourceLocation LBracLoc,
return ExprError();
}
- ExprResult Res(ParseAssignmentExpression());
+ ExprResult Expr;
+ if (getLangOpts().CPlusPlus11 && Tok.is(tok::l_brace)) {
+ Diag(Tok, diag::warn_cxx98_compat_generalized_initializer_lists);
+ Expr = ParseBraceInitializer();
+ } else
+ Expr = ParseAssignmentExpression();
+
+ ExprResult Res(Expr);
if (Res.isInvalid()) {
// We must manually skip to a ']', otherwise the expression skipper will
// stop at the ']' when it skips to the ';'. We want it to skip beyond
OpenPOWER on IntegriCloud