diff --git a/clang/lib/Analysis/CheckObjCDealloc.cpp b/clang/lib/Analysis/CheckObjCDealloc.cpp index 7bb0015462bb..6da52baed2fe 100644 --- a/clang/lib/Analysis/CheckObjCDealloc.cpp +++ b/clang/lib/Analysis/CheckObjCDealloc.cpp @@ -42,6 +42,13 @@ static bool scan_dealloc(Stmt* S, Selector Dealloc) { return false; } +static bool isSEL(QualType T, IdentifierInfo* SelII) { + if (const TypedefType* Ty = T->getAsTypedefType()) + return Ty->getDecl()->getIdentifier() == SelII; + + return false; +} + void clang::CheckObjCDealloc(ObjCImplementationDecl* D, const LangOptions& LOpts, BugReporter& BR) { @@ -56,6 +63,7 @@ void clang::CheckObjCDealloc(ObjCImplementationDecl* D, // http://llvm.org/bugs/show_bug.cgi?id=2517 bool containsPointerIvar = false; + IdentifierInfo* SelII = &Ctx.Idents.get("SEL"); for (ObjCInterfaceDecl::ivar_iterator I=ID->ivar_begin(), E=ID->ivar_end(); I!=E; ++I) { @@ -64,7 +72,8 @@ void clang::CheckObjCDealloc(ObjCImplementationDecl* D, QualType T = ID->getType(); if ((T->isPointerType() || T->isObjCQualifiedIdType()) && - ID->getAttr() == 0) { // Skip IBOutlets. + (ID->getAttr() == 0 && // Skip IBOutlets. + !isSEL(T, SelII))) { // Skip SEL ivars. containsPointerIvar = true; break; } diff --git a/clang/test/Analysis/IBOutlet.m b/clang/test/Analysis/IBOutlet.m deleted file mode 100644 index 4049e795547e..000000000000 --- a/clang/test/Analysis/IBOutlet.m +++ /dev/null @@ -1,20 +0,0 @@ -// RUN: clang -warn-objc-missing-dealloc '-DIBOutlet=__attribute__((iboutlet))' %s --verify - -#ifndef IBOutlet -#define IBOutlet -#endif - -@class NSWindow; - -@interface NSObject {} -- (void)dealloc; -@end - -@interface A : NSObject { -IBOutlet NSWindow *window; -} -@end - -@implementation A // no-warning -@end - diff --git a/clang/test/Analysis/MissingDealloc_SEL.m b/clang/test/Analysis/MissingDealloc_SEL.m new file mode 100644 index 000000000000..be3e0b7af815 --- /dev/null +++ b/clang/test/Analysis/MissingDealloc_SEL.m @@ -0,0 +1,30 @@ +// RUN: clang -warn-objc-missing-dealloc -verify %s + +typedef struct objc_selector *SEL; +typedef signed char BOOL; +typedef unsigned int NSUInteger; +typedef struct _NSZone NSZone; +@protocol NSObject +- (BOOL)isEqual:(id)object; +@end +@interface NSObject {} +- (id)init; +@end + +@interface TestSELs : NSObject { + SEL a; + SEL b; +} + +@end + +@implementation TestSELs // no-warning +- (id)init { + if( (self = [super init]) ) { + a = @selector(a); + b = @selector(b); + } + + return self; +} +@end