aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Chisnall <csdavec@swan.ac.uk>2011-08-08 17:32:19 +0000
committerDavid Chisnall <csdavec@swan.ac.uk>2011-08-08 17:32:19 +0000
commit7ca13ef64136929df852c038ebbddee070dc5119 (patch)
treeeb018bb6a80b22f73247f8f1b73cf739b7932ff6
parent4bd5d09e3a233ed23ec6f913166e4b75d8de215c (diff)
Silence the category-replacing-class-method warning for +load: category
implementations of +load do not replace the class definition in a meaningful sense, they are run when the category loads, the +load method for class is run when the class is loaded. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@137053 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Sema/SemaDeclObjC.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 3652a2cdd8..87948548a4 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -1311,6 +1311,9 @@ void Sema::WarnExactTypedMethods(ObjCMethodDecl *ImpMethodDecl,
}
if (match)
match = (ImpMethodDecl->isVariadic() == MethodDecl->isVariadic());
+ if (match)
+ match = !(MethodDecl->isClassMethod() &&
+ MethodDecl->getSelector() == GetNullarySelector("load", Context));
if (match) {
Diag(ImpMethodDecl->getLocation(),