From cd707abbc758149d9f7d37bd0b25298455c678b2 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Tue, 13 Mar 2012 01:09:36 +0000 Subject: [PATCH] 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 | 2 ++ test/ASTMerge/Inputs/interface2.m | 2 +- test/SemaObjC/invalid-code.m | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp index 27bdcd6c8cda..d224f1058a06 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(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 3fb43f5930c3..2133bd1381aa 100644 --- a/test/ASTMerge/Inputs/interface2.m +++ b/test/ASTMerge/Inputs/interface2.m @@ -69,7 +69,7 @@ - (float)wibble:(int)a1 second:(int)a2; @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 7b6591205b45..4ba34f0e47df 100644 --- a/test/SemaObjC/invalid-code.m +++ b/test/SemaObjC/invalid-code.m @@ -42,3 +42,9 @@ -(void) foo2 {} @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