summaryrefslogtreecommitdiffstats
path: root/clang/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
commitf40ef45c9d85a694c235cddba08235f50f0030a1 (patch)
tree14fd713be85ee491ee2c11c704ae1a8430609334 /clang/lib/Sema/SemaDeclObjC.cpp
parent7523743075abb994bb36f408855a4b70192191f4 (diff)
downloadbcm5719-llvm-f40ef45c9d85a694c235cddba08235f50f0030a1.tar.gz
bcm5719-llvm-f40ef45c9d85a694c235cddba08235f50f0030a1.zip
Objective-C. Fixes a bug where "new" family attribute
was not being overridden in the category method implementation resulting in bogus warning. // rdar://15919775 llvm-svn: 200342
Diffstat (limited to 'clang/lib/Sema/SemaDeclObjC.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclObjC.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp
index c91ce37711b..8337c1f7e5d 100644
--- a/clang/lib/Sema/SemaDeclObjC.cpp
+++ b/clang/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();
OpenPOWER on IntegriCloud