fix a bug I noticed by inspection, correcting two reject-valid bugs.

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

3 files changed, 14 insertions, 4 deletions

diff --git a/lib/Parse/ParseInit.cpp b/lib/Parse/ParseInit.cpp
index 57751c9c3f..123908d25a 100644
--- a/lib/Parse/ParseInit.cpp
+++ b/lib/Parse/ParseInit.cpp
@@ -14,6 +14,7 @@
 #include "clang/Parse/Designator.h"
 #include "clang/Parse/Parser.h"
 #include "clang/Parse/ParseDiagnostic.h"
+#include "clang/Parse/Scope.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace clang;
@@ -125,12 +126,16 @@ Parser::OwningExprResult Parser::ParseInitializerWithPotentialDesignator() {
     SourceLocation StartLoc = ConsumeBracket();
 
     // If Objective-C is enabled and this is a typename (class message send) or
-    // 'super', parse this as a message send expression.
+    // send to 'super', parse this as a message send expression.
     if (getLang().ObjC1 && Tok.is(tok::identifier)) {
       IdentifierInfo *II = Tok.getIdentifierInfo();
 
-      if (II == Ident_super || Actions.getTypeName(*II, Tok.getLocation(),
-                                                   CurScope)) {
+      // Three cases. This is a message send to a type: [type foo]
+      // This is a message send to super:  [super foo]
+      // This is a message sent to an expr:  [super.bar foo]
+      if (Actions.getTypeName(*II, Tok.getLocation(), CurScope) ||
+          (II == Ident_super && GetLookAheadToken(1).isNot(tok::period) &&
+           CurScope->isInObjcMethodScope())) {
         // If we have exactly one array designator, this used the GNU
         // 'designation: array-designator' extension, otherwise there should be no
         // designators at all!
diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp
index 42076a244e..6c5053d4fb 100644
--- a/lib/Parse/ParseObjc.cpp
+++ b/lib/Parse/ParseObjc.cpp
@@ -1723,7 +1723,6 @@ Parser::OwningExprResult Parser::ParseObjCMessageExpression() {
 
     // If this is '[' 'super', then this is a magic superclass message.
     // We parse '[' 'super' '.' 'foo'  as an expression?
-    // FIXME: Not in ParseInit.cpp?
     if ((II == Ident_super && GetLookAheadToken(1).isNot(tok::period) &&
          CurScope->isInObjcMethodScope()) ||
         // Check to see if this is a typename.  If so, it is a class message.
diff --git a/test/SemaObjC/super.m b/test/SemaObjC/super.m
index 66894230ea..88de77c259 100644
--- a/test/SemaObjC/super.m
+++ b/test/SemaObjC/super.m
@@ -6,6 +6,7 @@
 @end
 
 @interface A
++ superClassMethod;
 @end
 
 @interface B : A
@@ -21,6 +22,9 @@
 
 + classMethod {
   [super cMethod]; // expected-warning{{method '+cMethod' not found (return type defaults to 'id')}}
+  
+  id X[] = { [ super superClassMethod] };
+  id Y[] = { [ super.superClassMethod iMethod] };
   return 0;
 }
 @end
@@ -63,5 +67,7 @@ int test3() {
   id super = 0;
   [(B*)super instanceMethod];
   int *s1 = (int*)super;
+  
+  id X[] = { [ super superClassMethod] };
   return 0;
 }