Have the parser decide whether a message to super is a variable or

type, instead of having sema do it.

llvm-svn: 101016

1 files changed, 4 insertions, 2 deletions

diff --git a/clang/lib/Parse/ParseObjc.cpp b/clang/lib/Parse/ParseObjc.cpp
index 6e31f0f63c3..42076a244ea 100644
--- a/clang/lib/Parse/ParseObjc.cpp
+++ b/clang/lib/Parse/ParseObjc.cpp
@@ -1626,7 +1626,8 @@ Parser::DeclPtrTy Parser::ParseObjCMethodDefinition() {
   SourceLocation BraceLoc = Tok.getLocation();
 
   // Enter a scope for the method body.
-  ParseScope BodyScope(this, Scope::FnScope|Scope::DeclScope);
+  ParseScope BodyScope(this,
+                       Scope::ObjCMethodScope|Scope::FnScope|Scope::DeclScope);
 
   // Tell the actions module that we have entered a method definition with the
   // specified Declarator for the method.
@@ -1723,7 +1724,8 @@ 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)) ||
+    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.
         Actions.getTypeName(*II, Tok.getLocation(), CurScope)) {
       SourceLocation NameLoc = ConsumeToken();