ObjectiveC. typo fix in my last patch,

per Jordan's review.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@197540 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index d257e1750181a7ec3cf30de2d61e47679235494a..3584569911f51ad711c046e49ba1290b05c5cc46 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -777,7 +777,7 @@ def warn_arc_perform_selector_leaks : Warning<
   "performSelector may cause a leak because its selector is unknown">,
   InGroup<DiagGroup<"arc-performSelector-leaks">>;
 def warn_dealloc_in_category : Warning<
-"decalloc is being overridden in category">,
+"-dealloc in a category is being overridden">,
 InGroup<DeallocInCategory>;
 def err_gc_weak_property_strong_type : Error<
   "weak attribute declared on a __strong type property in GC mode">;

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index d536f33c085f3e95232dba05d83c2736a19499ab..078a0e3ab9fb3662b44a472bd4f7ea41f4bdf11c 100644 (file)
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -3215,11 +3215,9 @@ Decl *Sema::ActOnMethodDeclaration(
     }
     if (isa<ObjCCategoryImplDecl>(ImpDecl)) {
       ObjCMethodFamily family = ObjCMethod->getMethodFamily();
-      if (family == OMF_dealloc && IMD && IMD->isOverriding()) {
+      if (family == OMF_dealloc && IMD && IMD->isOverriding()) 
         Diag(ObjCMethod->getLocation(), diag::warn_dealloc_in_category)
           << ObjCMethod->getDeclName();
-        Diag(ImpDecl->getLocation(), diag::note_declared_at);
-      }
     }
   } else {
     cast<DeclContext>(ClassDecl)->addDecl(ObjCMethod);

diff --git a/test/SemaObjC/dealloc.m b/test/SemaObjC/dealloc.m
index 4e61424e686afa67183ef54cff373d9ebd4e5be3..a5d34e1f522b13dbf51268530ee3dbec12829690 100644 (file)
--- a/test/SemaObjC/dealloc.m
+++ b/test/SemaObjC/dealloc.m
@@ -35,7 +35,7 @@
 - (void)dealloc;
 @end
 
-@implementation Subclass (CAT) // expected-note {{declared here}}
-- (void)dealloc { // expected-warning {{decalloc is being overridden in category}}
+@implementation Subclass (CAT)
+- (void)dealloc { // expected-warning {{-dealloc in a category is being overridden}}
 }
 @end