diff options
| -rw-r--r-- | clang/lib/Sema/SemaDeclObjC.cpp | 5 | ||||
| -rw-r--r-- | clang/test/SemaObjC/super-dealloc-attribute.m | 39 |
2 files changed, 41 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp index 709a8685826..e81429cc4c7 100644 --- a/clang/lib/Sema/SemaDeclObjC.cpp +++ b/clang/lib/Sema/SemaDeclObjC.cpp @@ -388,9 +388,12 @@ void Sema::ActOnStartOfObjCMethodDef(Scope *FnBodyScope, Decl *D) { !(Context.getLangOpts().ObjCAutoRefCount || Context.getLangOpts().getGC() == LangOptions::GCOnly) && MDecl->getMethodFamily() == OMF_dealloc; - if (!getCurFunction()->ObjCShouldCallSuperDealloc) + if (!getCurFunction()->ObjCShouldCallSuperDealloc) { + IMD = IC->getSuperClass()->lookupMethod(MDecl->getSelector(), + MDecl->isInstanceMethod()); getCurFunction()->ObjCShouldCallSuperDealloc = (IMD && IMD->hasAttr<ObjCRequiresSuperAttr>()); + } getCurFunction()->ObjCShouldCallSuperFinalize = Context.getLangOpts().getGC() != LangOptions::NonGC && MDecl->getMethodFamily() == OMF_finalize; diff --git a/clang/test/SemaObjC/super-dealloc-attribute.m b/clang/test/SemaObjC/super-dealloc-attribute.m index 3adf7911656..0ba65cc0780 100644 --- a/clang/test/SemaObjC/super-dealloc-attribute.m +++ b/clang/test/SemaObjC/super-dealloc-attribute.m @@ -2,20 +2,30 @@ // RUN: %clang_cc1 -x objective-c++ -fsyntax-only -verify -Wno-objc-root-class %s // RUN: %clang_cc1 -fsyntax-only -fobjc-arc -verify -Wno-objc-root-class %s // RUN: %clang_cc1 -x objective-c++ -fobjc-arc -fsyntax-only -verify -Wno-objc-root-class %s - // rdar://6386358 + +#if __has_attribute(objc_requires_super) +#define NS_REQUIRES_SUPER __attribute((objc_requires_super)) +#endif + @protocol NSObject // expected-note {{protocol is declared here}} -- MyDealloc __attribute((objc_requires_super)); // expected-warning {{'objc_requires_super' attribute cannot be applied to methods in protocols}} +- MyDealloc NS_REQUIRES_SUPER; // expected-warning {{'objc_requires_super' attribute cannot be applied to methods in protocols}} @end @interface Root - MyDealloc __attribute((objc_requires_super)); - (void)XXX __attribute((objc_requires_super)); - (void) dealloc __attribute((objc_requires_super)); // expected-warning {{'objc_requires_super' attribute cannot be applied to dealloc}} +- (void) MyDeallocMeth; // Method in root is not annotated. +- (void) AnnotMyDeallocMeth __attribute((objc_requires_super)); +- (void) AnnotMyDeallocMethCAT NS_REQUIRES_SUPER; @end @interface Baz : Root<NSObject> - MyDealloc; +- (void) MyDeallocMeth __attribute((objc_requires_super)); // 'Baz' author has annotated method +- (void) AnnotMyDeallocMeth; // Annotated in root but not here. Annotation is inherited though +- (void) AnnotMeth __attribute((objc_requires_super)); // 'Baz' author has annotated method @end @implementation Baz @@ -27,5 +37,30 @@ - (void)XXX { [super MyDealloc]; } // expected-warning {{method possibly missing a [super XXX] call}} + +- (void) MyDeallocMeth {} // No warning here. +- (void) AnnotMyDeallocMeth{} // expected-warning {{method possibly missing a [super AnnotMyDeallocMeth] call}} +- (void) AnnotMeth{}; // No warning here. Annotation is in its class. +@end + +@interface Bar : Baz @end +@implementation Bar +- (void) MyDeallocMeth {} // expected-warning {{method possibly missing a [super MyDeallocMeth] call}} +- (void) AnnotMyDeallocMeth{} // expected-warning {{method possibly missing a [super AnnotMyDeallocMeth] call}} +- (void) AnnotMeth{}; // expected-warning {{method possibly missing a [super AnnotMeth] call}} +@end + +@interface Bar(CAT) +- (void) AnnotMyDeallocMethCAT; // Annotated in root but not here. Annotation is inherited though +- (void) AnnotMethCAT __attribute((objc_requires_super)); +@end + +@implementation Bar(CAT) +- (void) MyDeallocMeth {} // expected-warning {{method possibly missing a [super MyDeallocMeth] call}} +- (void) AnnotMyDeallocMeth{} // expected-warning {{method possibly missing a [super AnnotMyDeallocMeth] call}} +- (void) AnnotMeth{}; // expected-warning {{method possibly missing a [super AnnotMeth] call}} +- (void) AnnotMyDeallocMethCAT{}; // expected-warning {{method possibly missing a [super AnnotMyDeallocMethCAT] call}} +- (void) AnnotMethCAT {}; +@end |
