Skip to content

Commit 1b30b59

Browse files
author
Fariborz Jahanian
committed
ObjectiveC. typo fix in my last patch,
per Jordan's review. llvm-svn: 197540
1 parent 47f615e commit 1b30b59

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ def warn_arc_perform_selector_leaks : Warning<
777777
"performSelector may cause a leak because its selector is unknown">,
778778
InGroup<DiagGroup<"arc-performSelector-leaks">>;
779779
def warn_dealloc_in_category : Warning<
780-
"decalloc is being overridden in category">,
780+
"-dealloc in a category is being overridden">,
781781
InGroup<DeallocInCategory>;
782782
def err_gc_weak_property_strong_type : Error<
783783
"weak attribute declared on a __strong type property in GC mode">;

clang/lib/Sema/SemaDeclObjC.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3215,11 +3215,9 @@ Decl *Sema::ActOnMethodDeclaration(
32153215
}
32163216
if (isa<ObjCCategoryImplDecl>(ImpDecl)) {
32173217
ObjCMethodFamily family = ObjCMethod->getMethodFamily();
3218-
if (family == OMF_dealloc && IMD && IMD->isOverriding()) {
3218+
if (family == OMF_dealloc && IMD && IMD->isOverriding())
32193219
Diag(ObjCMethod->getLocation(), diag::warn_dealloc_in_category)
32203220
<< ObjCMethod->getDeclName();
3221-
Diag(ImpDecl->getLocation(), diag::note_declared_at);
3222-
}
32233221
}
32243222
} else {
32253223
cast<DeclContext>(ClassDecl)->addDecl(ObjCMethod);

clang/test/SemaObjC/dealloc.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ @interface Subclass (CAT)
3535
- (void)dealloc;
3636
@end
3737

38-
@implementation Subclass (CAT) // expected-note {{declared here}}
39-
- (void)dealloc { // expected-warning {{decalloc is being overridden in category}}
38+
@implementation Subclass (CAT)
39+
- (void)dealloc { // expected-warning {{-dealloc in a category is being overridden}}
4040
}
4141
@end

0 commit comments

Comments
 (0)