Fix <rdar://problem/6252129> implementation of method in category doesn't effectively declare it for methods below.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@56771 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index f553629..dcd197d 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -92,10 +92,14 @@
/// This is only necessary for issuing pretty diagnostics.
llvm::SmallVector<TypedefDecl*, 24> ExtVectorDecls;
- /// ObjCImplementations - Keep track of all of the classes with
- /// @implementation's, so that we can emit errors on duplicates.
+ /// ObjCImplementations - Keep track of all class @implementations
+ /// so we can emit errors on duplicates.
llvm::DenseMap<IdentifierInfo*, ObjCImplementationDecl*> ObjCImplementations;
+ /// ObjCCategoryImpls - Maintain a list of category implementations so
+ /// we can check for duplicates and find local method declarations.
+ llvm::SmallVector<ObjCCategoryImplDecl*, 8> ObjCCategoryImpls;
+
/// ObjCProtocols - Keep track of all protocol declarations declared
/// with @protocol keyword, so that we can emit errors on duplicates and
/// find the declarations when needed.
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index a09daa0..0241655 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -429,6 +429,7 @@
/// TODO: Check that CatName, category name, is not used in another
// implementation.
+ ObjCCategoryImpls.push_back(CDecl);
return CDecl;
}
diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp
index 390baed..a2a3992 100644
--- a/lib/Sema/SemaExprObjC.cpp
+++ b/lib/Sema/SemaExprObjC.cpp
@@ -233,6 +233,14 @@
if (ObjCImplementationDecl *ImpDecl =
ObjCImplementations[ClassDecl->getIdentifier()])
Method = ImpDecl->getClassMethod(Sel);
+
+ // Look through local category implementations associated with the class.
+ if (!Method) {
+ for (unsigned i = 0; i < ObjCCategoryImpls.size() && !Method; i++) {
+ if (ObjCCategoryImpls[i]->getClassInterface() == ClassDecl)
+ Method = ObjCCategoryImpls[i]->getClassMethod(Sel);
+ }
+ }
}
// Before we give up, check if the selector is an instance method.
if (!Method)