handle the full assignment-expression grammar when using an
objc message send in an initializer expression.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51882 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h
index 84fe49a..3d3e200 100644
--- a/include/clang/Parse/Parser.h
+++ b/include/clang/Parse/Parser.h
@@ -403,6 +403,9 @@
ExprResult ParseObjCMessageExpressionBody(SourceLocation LBracloc,
IdentifierInfo *ReceiverName,
ExprTy *ReceiverExpr);
+ ExprResult ParseAssignmentExprWithObjCMessageExprStart(SourceLocation LBracloc,
+ IdentifierInfo *ReceiverName,
+ ExprTy *ReceiverExpr);
//===--------------------------------------------------------------------===//
// C99 6.8: Statements and Blocks.
diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index 523f647..4bccc38 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -200,6 +200,27 @@
return ParseRHSOfBinaryExpression(LHS, prec::Assignment);
}
+/// ParseAssignmentExprWithObjCMessageExprStart - Parse an assignment expression
+/// where part of an objc message send has already been parsed. In this case
+/// LBracLoc indicates the location of the '[' of the message send, and either
+/// ReceiverName or ReceiverExpr is non-null indicating the receiver of the
+/// message.
+///
+/// Since this handles full assignment-expression's, it handles postfix
+/// expressions and other binary operators for these expressions as well.
+Parser::ExprResult
+Parser::ParseAssignmentExprWithObjCMessageExprStart(SourceLocation LBracLoc,
+ IdentifierInfo *ReceiverName,
+ ExprTy *ReceiverExpr) {
+ ExprResult R = ParseObjCMessageExpressionBody(LBracLoc, ReceiverName,
+ ReceiverExpr);
+ if (R.isInvalid) return R;
+ R = ParsePostfixExpressionSuffix(R);
+ if (R.isInvalid) return R;
+ return ParseRHSOfBinaryExpression(R, 2);
+}
+
+
Parser::ExprResult Parser::ParseConstantExpression() {
ExprResult LHS = ParseCastExpression(false);
if (LHS.isInvalid) return LHS;
diff --git a/lib/Parse/ParseInit.cpp b/lib/Parse/ParseInit.cpp
index c40fe88..a1fe04b 100644
--- a/lib/Parse/ParseInit.cpp
+++ b/lib/Parse/ParseInit.cpp
@@ -98,8 +98,7 @@
// [4][foo bar].
IdentifierInfo *Name = Tok.getIdentifierInfo();
ConsumeToken();
- ExprResult R = ParseObjCMessageExpressionBody(StartLoc, Name, 0);
- return ParsePostfixExpressionSuffix(R);
+ return ParseAssignmentExprWithObjCMessageExprStart(StartLoc, Name, 0);
}
// Note that we parse this as an assignment expression, not a constant
@@ -113,13 +112,13 @@
// Given an expression, we could either have a designator (if the next
// tokens are '...' or ']' or an objc message send. If this is an objc
- // message send, handle it now.
+ // message send, handle it now. An objc-message send is the start of
+ // an assignment-expression production.
if (getLang().ObjC1 && Tok.isNot(tok::ellipsis) &&
Tok.isNot(tok::r_square)) {
// FIXME: Emit ext_gnu_missing_equal_designator for inits like
// [4][foo bar].
- ExprResult R = ParseObjCMessageExpressionBody(StartLoc, 0, Idx.Val);
- return ParsePostfixExpressionSuffix(R);
+ return ParseAssignmentExprWithObjCMessageExprStart(StartLoc, 0,Idx.Val);
}
// Handle the gnu array range extension.
diff --git a/test/Parser/objc-init.m b/test/Parser/objc-init.m
index ce7acaf..303d80c 100644
--- a/test/Parser/objc-init.m
+++ b/test/Parser/objc-init.m
@@ -3,6 +3,7 @@
@interface NSNumber;
- () METH;
+- (unsigned) METH2;
@end
void test1() {
@@ -15,3 +16,8 @@
}
+// rdar://5977581
+void test3() {
+ unsigned x[] = {[NSNumber METH2]+2};
+}
+