diff options
| -rw-r--r-- | lib/Analysis/CFRefCount.cpp | 16 | ||||
| -rw-r--r-- | test/Analysis/NSString.m | 9 |
2 files changed, 19 insertions, 6 deletions
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp index 575a47b776..052a610db1 100644 --- a/lib/Analysis/CFRefCount.cpp +++ b/lib/Analysis/CFRefCount.cpp @@ -784,18 +784,22 @@ RetainSummaryManager::getPersistentSummary(ArgEffects* AE, RetEffect RetEff, // Predicates. //===----------------------------------------------------------------------===// -bool RetainSummaryManager::isTrackedObjectType(QualType T) { - if (!Ctx.isObjCObjectPointerType(T)) +bool RetainSummaryManager::isTrackedObjectType(QualType Ty) { + if (!Ctx.isObjCObjectPointerType(Ty)) return false; - // Does it subclass NSObject? - ObjCInterfaceType* OT = dyn_cast<ObjCInterfaceType>(T.getTypePtr()); + // We assume that id<..>, id, and "Class" all represent tracked objects. + const PointerType *PT = Ty->getAsPointerType(); + if (PT == 0) + return true; + + const ObjCInterfaceType *OT = PT->getPointeeType()->getAsObjCInterfaceType(); // We assume that id<..>, id, and "Class" all represent tracked objects. if (!OT) return true; - - // Does the object type subclass NSObject? + + // Does the interface subclass NSObject? // FIXME: We can memoize here if this gets too expensive. IdentifierInfo* NSObjectII = &Ctx.Idents.get("NSObject"); ObjCInterfaceDecl* ID = OT->getDecl(); diff --git a/test/Analysis/NSString.m b/test/Analysis/NSString.m index a95e8868c3..3f2b09189e 100644 --- a/test/Analysis/NSString.m +++ b/test/Analysis/NSString.m @@ -251,3 +251,12 @@ void test_stringWithFormat() { [string release]; // expected-warning{{Incorrect decrement of the reference count}} } +// Test isTrackedObjectType() +typedef NSString* WonkyTypedef; +@interface TestIsTracked ++ (WonkyTypedef)newString; +@end + +void test_isTrackedObjectType(void) { + NSString *str = [TestIsTracked newString]; // expected-warning{{Potential leak}} +} |