summaryrefslogtreecommitdiffstats
path: root/lib/Sema/SemaDeclObjC.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2014-01-28 22:46:29 +0000
committerFariborz Jahanian <fjahanian@apple.com>2014-01-28 22:46:29 +0000
commit8549ec2604f3896eece840d27d7661052c8d394a (patch)
tree36ac2186494b9dcbcbd0313b39530ada73c029a6 /lib/Sema/SemaDeclObjC.cpp
parent7c447ca017b674be488acbbeda972c3dfe0b5aa3 (diff)
Objective-C. Fixes a bug where "new" family attribute
was not being overridden in the category method implementation resulting in bogus warning. // rdar://15919775 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@200342 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDeclObjC.cpp')
-rw-r--r--lib/Sema/SemaDeclObjC.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index c91ce37711..8337c1f7e5 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -3165,7 +3165,8 @@ Decl *Sema::ActOnMethodDeclaration(
ObjCMethod->getLocation()));
}
if (isa<ObjCCategoryImplDecl>(ImpDecl)) {
- ObjCMethodFamily family = ObjCMethod->getMethodFamily();
+ ObjCMethodFamily family =
+ ObjCMethod->getSelector().getMethodFamily();
if (family == OMF_dealloc && IMD && IMD->isOverriding())
Diag(ObjCMethod->getLocation(), diag::warn_dealloc_in_category)
<< ObjCMethod->getDeclName();