[cfe-commits] r101048 - in /cfe/trunk: lib/Parse/ParseExpr.cpp test/SemaObjC/super.m

[Chris Lattner]

Author: lattner
Date: Mon Apr 12 12:09:27 2010
New Revision: 101048

URL: http://llvm.org/viewvc/llvm-project?rev=101048&view=rev
Log:
tighten the check for cast of super to avoid rejecting valid code,
rdar://7853261

Modified:
    cfe/trunk/lib/Parse/ParseExpr.cpp
    cfe/trunk/test/SemaObjC/super.m

Modified: cfe/trunk/lib/Parse/ParseExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExpr.cpp?rev=101048&r1=101047&r2=101048&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseExpr.cpp (original)
+++ cfe/trunk/lib/Parse/ParseExpr.cpp Mon Apr 12 12:09:27 2010
@@ -1444,7 +1444,8 @@
       // Reject the cast of super idiom in ObjC.
       if (Tok.is(tok::identifier) && getLang().ObjC1 &&
           Tok.getIdentifierInfo() == Ident_super && 
-          CurScope->isInObjcMethodScope()) {
+          CurScope->isInObjcMethodScope() &&
+          GetLookAheadToken(1).isNot(tok::period)) {
         Diag(Tok.getLocation(), diag::err_illegal_super_cast)
           << SourceRange(OpenLoc, RParenLoc);
         return ExprError();

Modified: cfe/trunk/test/SemaObjC/super.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/super.m?rev=101048&r1=101047&r2=101048&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/super.m (original)
+++ cfe/trunk/test/SemaObjC/super.m Mon Apr 12 12:09:27 2010
@@ -34,7 +34,11 @@
   [super cMethod]; // expected-warning{{method '+cMethod' not found (return type defaults to 'id')}}
   
   id X[] = { [ super superClassMethod] };
-  id Y[] = { [ super.superClassMethod iMethod] };
+  id Y[] = {
+    [ super.superClassMethod iMethod],
+    super.superClassMethod,
+    (id)super.superClassMethod  // not a cast of super: rdar://7853261
+  };
   return 0;
 }
 @end