[cfe-commits] r152596 - in /cfe/trunk: lib/Sema/SemaDeclObjC.cpp test/ASTMerge/Inputs/interface2.m test/SemaObjC/invalid-code.m

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Mon Mar 12 20:09:36 2012
New Revision: 152596

URL: http://llvm.org/viewvc/llvm-project?rev=152596&view=rev
Log:
Fix crash at @implementation with a forward reference as base class.

rdar://11020003

Modified:
    cfe/trunk/lib/Sema/SemaDeclObjC.cpp
    cfe/trunk/test/ASTMerge/Inputs/interface2.m
    cfe/trunk/test/SemaObjC/invalid-code.m

Modified: cfe/trunk/lib/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclObjC.cpp?rev=152596&r1=152595&r2=152596&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclObjC.cpp Mon Mar 12 20:09:36 2012
@@ -925,6 +925,8 @@
       Diag(PrevDecl->getLocation(), diag::note_previous_definition);
     } else {
       SDecl = dyn_cast_or_null<ObjCInterfaceDecl>(PrevDecl);
+      if (SDecl && !SDecl->hasDefinition())
+        SDecl = 0;
       if (!SDecl)
         Diag(SuperClassLoc, diag::err_undef_superclass)
           << SuperClassname << ClassName;

Modified: cfe/trunk/test/ASTMerge/Inputs/interface2.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ASTMerge/Inputs/interface2.m?rev=152596&r1=152595&r2=152596&view=diff
==============================================================================
--- cfe/trunk/test/ASTMerge/Inputs/interface2.m (original)
+++ cfe/trunk/test/ASTMerge/Inputs/interface2.m Mon Mar 12 20:09:36 2012
@@ -69,7 +69,7 @@
 @end
 
 // Forward-declared interface
- at class I12, I10;
+ at class I10; @interface I12 @end
 @interface I11
 @end
 

Modified: cfe/trunk/test/SemaObjC/invalid-code.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/invalid-code.m?rev=152596&r1=152595&r2=152596&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/invalid-code.m (original)
+++ cfe/trunk/test/SemaObjC/invalid-code.m Mon Mar 12 20:09:36 2012
@@ -42,3 +42,9 @@
 @end
 
 @end // expected-error {{'@end' must appear in an Objective-C context}}
+
+ at class ForwardBase;
+ at implementation SomeI : ForwardBase // expected-error {{cannot find interface declaration for 'ForwardBase', superclass of 'SomeI'}} \
+                                    // expected-warning {{cannot find interface declaration for 'SomeI'}}
+-(void)meth {}
+ at end