Fix <rdar://problem/6150376> [sema] crash on invalid message send.

The core fix in Sema::ActOnClassMessage(). All the other changes have to do with passing down the SourceLocation for the receiver (to properly position the cursor when producing an error diagnostic).



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59639 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 14 insertions, 8 deletions

diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index 440393dac6..5f36f0bb27 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -212,9 +212,10 @@ Parser::ExprResult Parser::ParseAssignmentExpression() {
 /// expressions and other binary operators for these expressions as well.
 Parser::ExprResult 
 Parser::ParseAssignmentExprWithObjCMessageExprStart(SourceLocation LBracLoc,
+                                                    SourceLocation NameLoc,
                                                    IdentifierInfo *ReceiverName,
                                                     ExprTy *ReceiverExpr) {
-  ExprResult R = ParseObjCMessageExpressionBody(LBracLoc, ReceiverName,
+  ExprResult R = ParseObjCMessageExpressionBody(LBracLoc, NameLoc, ReceiverName,
                                                 ReceiverExpr);
   if (R.isInvalid) return R;
   R = ParsePostfixExpressionSuffix(R);
diff --git a/lib/Parse/ParseInit.cpp b/lib/Parse/ParseInit.cpp
index 9b488566a6..c3d2cd2c4c 100644
--- a/lib/Parse/ParseInit.cpp
+++ b/lib/Parse/ParseInit.cpp
@@ -134,8 +134,9 @@ ParseInitializerWithPotentialDesignator(InitListDesignations &Designations,
       }
       
       IdentifierInfo *Name = Tok.getIdentifierInfo();
-      ConsumeToken();
-      return ParseAssignmentExprWithObjCMessageExprStart(StartLoc, Name, 0);
+      SourceLocation NameLoc = ConsumeToken();
+      return ParseAssignmentExprWithObjCMessageExprStart(StartLoc, NameLoc,
+                                                         Name, 0);
     }
     
     // Note that we parse this as an assignment expression, not a constant
@@ -166,7 +167,9 @@ ParseInitializerWithPotentialDesignator(InitListDesignations &Designations,
           Diag(Tok, diag::err_expected_equal_designator);
       }
       
-      return ParseAssignmentExprWithObjCMessageExprStart(StartLoc, 0,Idx.Val);
+      return ParseAssignmentExprWithObjCMessageExprStart(StartLoc,
+                                                         SourceLocation(), 
+                                                         0, Idx.Val);
     }
 
     // Create designation if we haven't already.
diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp
index 793945bfd1..9c97ea2efa 100644
--- a/lib/Parse/ParseObjc.cpp
+++ b/lib/Parse/ParseObjc.cpp
@@ -1424,8 +1424,8 @@ Parser::ExprResult Parser::ParseObjCMessageExpression() {
   // Parse receiver
   if (isTokObjCMessageIdentifierReceiver()) {
     IdentifierInfo *ReceiverName = Tok.getIdentifierInfo();
-    ConsumeToken();
-    return ParseObjCMessageExpressionBody(LBracLoc, ReceiverName, 0);
+    SourceLocation NameLoc = ConsumeToken();
+    return ParseObjCMessageExpressionBody(LBracLoc, NameLoc, ReceiverName, 0);
   }
 
   ExprResult Res = ParseExpression();
@@ -1434,7 +1434,7 @@ Parser::ExprResult Parser::ParseObjCMessageExpression() {
     return Res;
   }
   
-  return ParseObjCMessageExpressionBody(LBracLoc, 0, Res.Val);
+  return ParseObjCMessageExpressionBody(LBracLoc, SourceLocation(), 0, Res.Val);
 }
   
 /// ParseObjCMessageExpressionBody - Having parsed "'[' objc-receiver", parse
@@ -1460,6 +1460,7 @@ Parser::ExprResult Parser::ParseObjCMessageExpression() {
 ///   
 Parser::ExprResult
 Parser::ParseObjCMessageExpressionBody(SourceLocation LBracLoc,
+                                       SourceLocation NameLoc,
                                        IdentifierInfo *ReceiverName,
                                        ExprTy *ReceiverExpr) {
   // Parse objc-selector
@@ -1548,7 +1549,8 @@ Parser::ParseObjCMessageExpressionBody(SourceLocation LBracLoc,
   // We've just parsed a keyword message.
   if (ReceiverName) 
     return Actions.ActOnClassMessage(CurScope,
-                                     ReceiverName, Sel, LBracLoc, RBracLoc,
+                                     ReceiverName, Sel, 
+                                     LBracLoc, NameLoc, RBracLoc,
                                      &KeyExprs[0], KeyExprs.size());
   return Actions.ActOnInstanceMessage(ReceiverExpr, Sel, LBracLoc, RBracLoc,
                                       &KeyExprs[0], KeyExprs.size());