From fae664ac57991485a6235c2e27eaf089d5f54846 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Sat, 16 May 2009 01:38:01 +0000 Subject: [PATCH] Fix: False positive: don't flag leaks for return types that cannot be determined to be CF types git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@71921 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/CFRefCount.cpp | 47 ++++++++++++++++++++-------------- test/Analysis/retain-release.m | 19 ++++++++++++++ 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp index 215be47086..fbe9582516 100644 --- a/lib/Analysis/CFRefCount.cpp +++ b/lib/Analysis/CFRefCount.cpp @@ -894,11 +894,18 @@ bool RetainSummaryManager::isTrackedObjCObjectType(QualType Ty) { if (!OT) return true; - // Does the interface subclass NSObject? - // FIXME: We can memoize here if this gets too expensive. - IdentifierInfo* NSObjectII = &Ctx.Idents.get("NSObject"); + // Does the interface subclass NSObject? + // FIXME: We can memoize here if this gets too expensive. ObjCInterfaceDecl* ID = OT->getDecl(); + // Assume that anything declared with a forward declaration and no + // @interface subclasses NSObject. + if (ID->isForwardDecl()) + return true; + + IdentifierInfo* NSObjectII = &Ctx.Idents.get("NSObject"); + + for ( ; ID ; ID = ID->getSuperClass()) if (ID->getIdentifier() == NSObjectII) return true; @@ -3142,22 +3149,24 @@ void CFRefCount::EvalReturn(ExplodedNodeSet& Dst, RetEffect RE = Summ.getRetEffect(); bool hasError = false; - if (isGCEnabled() && RE.getObjKind() == RetEffect::ObjC) { - // Things are more complicated with garbage collection. If the - // returned object is suppose to be an Objective-C object, we have - // a leak (as the caller expects a GC'ed object) because no - // method should return ownership unless it returns a CF object. - X = X ^ RefVal::ErrorGCLeakReturned; - - // Keep this false until this is properly tested. - hasError = true; - } - else if (!RE.isOwned()) { - // Either we are using GC and the returned object is a CF type - // or we aren't using GC. In either case, we expect that the - // enclosing method is expected to return ownership. - hasError = true; - X = X ^ RefVal::ErrorLeakReturned; + if (RE.getKind() != RetEffect::NoRet) { + if (isGCEnabled() && RE.getObjKind() == RetEffect::ObjC) { + // Things are more complicated with garbage collection. If the + // returned object is suppose to be an Objective-C object, we have + // a leak (as the caller expects a GC'ed object) because no + // method should return ownership unless it returns a CF object. + X = X ^ RefVal::ErrorGCLeakReturned; + + // Keep this false until this is properly tested. + hasError = true; + } + else if (!RE.isOwned()) { + // Either we are using GC and the returned object is a CF type + // or we aren't using GC. In either case, we expect that the + // enclosing method is expected to return ownership. + hasError = true; + X = X ^ RefVal::ErrorLeakReturned; + } } if (hasError) { diff --git a/test/Analysis/retain-release.m b/test/Analysis/retain-release.m index ed9f661704..4a079055c5 100644 --- a/test/Analysis/retain-release.m +++ b/test/Analysis/retain-release.m @@ -631,6 +631,25 @@ void test_RDar6859457(RDar6859457 *x, void *bytes, NSUInteger dataLength) { return [[NSString alloc] init]; // expected-warning{{leak}} } +//===----------------------------------------------------------------------===// +// don't flag leaks for return types that cannot be +// determined to be CF types +//===----------------------------------------------------------------------===// + +// We don't know if 'struct s6893565' represents a Core Foundation type, so +// we shouldn't emit an error here. +typedef struct s6893565* TD6893565; + +@interface RDar6893565 {} +-(TD6893565)newThing; +@end + +@implementation RDar6893565 +-(TD6893565)newThing { + return (TD6893565) [[NSString alloc] init]; // no-warning +} +@end + //===----------------------------------------------------------------------===// // Tests of ownership attributes. //===----------------------------------------------------------------------===// -- 2.40.0