[Sema] Fix crash-on-invalid-code issue:

@class I;
@implementation I(cat) // crashes here
@end

rdar://10968158

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

diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp
index 996e93a8f95ca508ffa8d7f5828bb62de679dd32..7822eb217fea7c54f650f74c05cd365a89ef4bef 100644 (file)
--- a/lib/AST/DeclObjC.cpp
+++ b/lib/AST/DeclObjC.cpp
@@ -806,6 +806,10 @@ ObjCIvarDecl *ObjCInterfaceDecl::all_declared_ivar_begin() {
 ///
 ObjCCategoryDecl *
 ObjCInterfaceDecl::FindCategoryDeclaration(IdentifierInfo *CategoryId) const {
+  // FIXME: Should make sure no callers ever do this.
+  if (!hasDefinition())
+    return 0;
+
   if (data().ExternallyCompleted)
     LoadExternalDefinition();
 

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 9b492600ca1cedacac2da9842447e67454ab66ff..4df5ab39168fef4327550c0803d2a218c004bf98 100644 (file)
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -820,7 +820,7 @@ Decl *Sema::ActOnStartCategoryImplementation(
                       IdentifierInfo *CatName, SourceLocation CatLoc) {
   ObjCInterfaceDecl *IDecl = getObjCInterfaceDecl(ClassName, ClassLoc, true);
   ObjCCategoryDecl *CatIDecl = 0;
-  if (IDecl) {
+  if (IDecl && IDecl->hasDefinition()) {
     CatIDecl = IDecl->FindCategoryDeclaration(CatName);
     if (!CatIDecl) {
       // Category @implementation with no corresponding @interface.

diff --git a/test/SemaObjC/category-1.m b/test/SemaObjC/category-1.m
index 137309f755d6895f9250d6d215a28a2002dc75e0..d5ca0e213a0914e9e988e880088f9157c4e7c8b1 100644 (file)
--- a/test/SemaObjC/category-1.m
+++ b/test/SemaObjC/category-1.m
@@ -95,3 +95,7 @@
 @synthesize name = _name;
 @end
 
+// rdar://10968158
+@class I; // expected-note {{forward declaration}}
+@implementation I(cat) // expected-error{{cannot find interface declaration}}
+@end