diff options
| -rw-r--r-- | lib/Sema/SemaDeclObjC.cpp | 13 | ||||
| -rw-r--r-- | test/SemaObjC/category-1.m | 9 |
2 files changed, 17 insertions, 5 deletions
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp index 02430e6da5..10bc1c27f0 100644 --- a/lib/Sema/SemaDeclObjC.cpp +++ b/lib/Sema/SemaDeclObjC.cpp @@ -2520,7 +2520,8 @@ public: // interface and each other. if (ObjCCategoryDecl *Category = dyn_cast<ObjCCategoryDecl>(container)) { searchFromContainer(container); - searchFromContainer(Category->getClassInterface()); + if (ObjCInterfaceDecl *Interface = Category->getClassInterface()) + searchFromContainer(Interface); } else { searchFromContainer(container); } @@ -2569,11 +2570,12 @@ private: // declaration. if (ObjCCategoryDecl *category = impl->getCategoryDecl()) { search(category); - search(category->getClassInterface()); + if (ObjCInterfaceDecl *Interface = category->getClassInterface()) + search(Interface); // Otherwise it overrides declarations from the class. - } else { - search(impl->getClassInterface()); + } else if (ObjCInterfaceDecl *Interface = impl->getClassInterface()) { + search(Interface); } } @@ -2598,7 +2600,8 @@ private: void searchFrom(ObjCImplementationDecl *impl) { // A method in a class implementation overrides declarations from // the class interface. - search(impl->getClassInterface()); + if (ObjCInterfaceDecl *Interface = impl->getClassInterface()) + search(Interface); } diff --git a/test/SemaObjC/category-1.m b/test/SemaObjC/category-1.m index f8422782d7..a7e69651ad 100644 --- a/test/SemaObjC/category-1.m +++ b/test/SemaObjC/category-1.m @@ -99,3 +99,12 @@ @class I; // expected-note {{forward declaration}} @implementation I(cat) // expected-error{{cannot find interface declaration}} @end + +// <rdar://problem/11478173> +@interface Unrelated +- foo; +@end + +@interface Blah (Blarg) // expected-error{{cannot find interface declaration for 'Blah'}} +- foo; +@end |