diff options
| -rw-r--r-- | lib/Sema/SemaDeclObjC.cpp | 2 | ||||
| -rw-r--r-- | test/ASTMerge/Inputs/interface2.m | 2 | ||||
| -rw-r--r-- | test/SemaObjC/invalid-code.m | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp index 27bdcd6c8c..d224f1058a 100644 --- a/lib/Sema/SemaDeclObjC.cpp +++ b/lib/Sema/SemaDeclObjC.cpp @@ -925,6 +925,8 @@ Decl *Sema::ActOnStartClassImplementation( 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; diff --git a/test/ASTMerge/Inputs/interface2.m b/test/ASTMerge/Inputs/interface2.m index 3fb43f5930..2133bd1381 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 diff --git a/test/SemaObjC/invalid-code.m b/test/SemaObjC/invalid-code.m index 7b6591205b..4ba34f0e47 100644 --- a/test/SemaObjC/invalid-code.m +++ b/test/SemaObjC/invalid-code.m @@ -42,3 +42,9 @@ void foo() { @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 |