diff options
| -rw-r--r-- | lib/StaticAnalyzer/Checkers/ObjCSelfInitChecker.cpp | 16 | ||||
| -rw-r--r-- | test/Analysis/self-init.m | 13 |
2 files changed, 27 insertions, 2 deletions
diff --git a/lib/StaticAnalyzer/Checkers/ObjCSelfInitChecker.cpp b/lib/StaticAnalyzer/Checkers/ObjCSelfInitChecker.cpp index c887ac86ef..b62d2309fc 100644 --- a/lib/StaticAnalyzer/Checkers/ObjCSelfInitChecker.cpp +++ b/lib/StaticAnalyzer/Checkers/ObjCSelfInitChecker.cpp @@ -270,11 +270,23 @@ static bool shouldRunOnFunctionOrMethod(const NamedDecl *ND) { const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(ND); if (!MD) return false; - if (!MD->getClassInterface()->getSuperClass()) - return false; if (!isInitializationMethod(MD)) return false; + // self = [super init] applies only to NSObject subclasses. + // For instance, NSProxy doesn't implement -init. + ASTContext& Ctx = MD->getASTContext(); + IdentifierInfo* NSObjectII = &Ctx.Idents.get("NSObject"); + ObjCInterfaceDecl* ID = MD->getClassInterface()->getSuperClass(); + for ( ; ID ; ID = ID->getSuperClass()) { + IdentifierInfo *II = ID->getIdentifier(); + + if (II == NSObjectII) + break; + } + if (!ID) + return false; + return true; } diff --git a/test/Analysis/self-init.m b/test/Analysis/self-init.m index 8b2b82faba..9c30d26be0 100644 --- a/test/Analysis/self-init.m +++ b/test/Analysis/self-init.m @@ -17,6 +17,9 @@ -(id)init; -(id)release; @end +@interface NSProxy <NSObject> {} +@end + //#import "Foundation/NSObject.h" typedef unsigned NSUInteger; typedef int NSInteger; @@ -48,6 +51,10 @@ extern void *somePtr; -(void)doSomething; @end +@interface MyProxyObj : NSProxy {} +-(id)init; +@end + @implementation MyObj -(id)init { @@ -137,3 +144,9 @@ extern void *somePtr; -(void)doSomething {} @end + +@implementation MyProxyObj + +- (id)init { return self; } + +@end |