commit cd707abbc758149d9f7d37bd0b25298455c678b2
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Tue Mar 13 01:09:36 2012 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Tue Mar 13 01:09:36 2012 +0000
tree 3eff0bb6d40f23d603990709797bf4e031de642c
parent 78dae24600a877f52dbb6e58bfd5778754a00974

Fix crash at @implementation with a forward reference as base class.

rdar://11020003

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

lib/Sema/SemaDeclObjC.cpp

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 27bdcd6..d224f10 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -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;

test/ASTMerge/Inputs/interface2.m

diff --git a/test/ASTMerge/Inputs/interface2.m b/test/ASTMerge/Inputs/interface2.m
index 3fb43f5..2133bd1 100644
--- a/test/ASTMerge/Inputs/interface2.m
+++ b/test/ASTMerge/Inputs/interface2.m
@@ -69,7 +69,7 @@
 @end
 
 // Forward-declared interface
-@class I12, I10;
+@class I10; @interface I12 @end
 @interface I11
 @end
 

test/SemaObjC/invalid-code.m

diff --git a/test/SemaObjC/invalid-code.m b/test/SemaObjC/invalid-code.m
index 7b65912..4ba34f0 100644
--- a/test/SemaObjC/invalid-code.m
+++ b/test/SemaObjC/invalid-code.m
@@ -42,3 +42,9 @@
 @end
 
 @end // expected-error {{'@end' must appear in an Objective-C context}}
+
+@class ForwardBase;
+@implementation SomeI : ForwardBase // expected-error {{cannot find interface declaration for 'ForwardBase', superclass of 'SomeI'}} \
+                                    // expected-warning {{cannot find interface declaration for 'SomeI'}}
+-(void)meth {}
+@end