From 1f8e4346fac477398c2443cbe7c0289b038db2d0 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Sun, 10 May 2009 16:52:15 +0000 Subject: Add special warning about returning a retained object where a GC'ed object is expected. llvm-svn: 71397 --- clang/lib/Analysis/CFRefCount.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'clang/lib/Analysis/CFRefCount.cpp') diff --git a/clang/lib/Analysis/CFRefCount.cpp b/clang/lib/Analysis/CFRefCount.cpp index 2715a9633f2..4b254e07d59 100644 --- a/clang/lib/Analysis/CFRefCount.cpp +++ b/clang/lib/Analysis/CFRefCount.cpp @@ -2517,9 +2517,10 @@ CFRefLeakReport::getEndPath(BugReporterContext& BRC, else if (RV->getKind() == RefVal::ErrorGCLeakReturned) { ObjCMethodDecl& MD = cast(BRC.getCodeDecl()); os << " and returned from method '" << MD.getSelector().getAsString() - << "' is potentially leaked when using garbage collection. Callers" - " of this method do not expect a +1 retain count since the return" - " type is an Objective-C object reference"; + << "' is potentially leaked when using garbage collection. Callers " + "of this method do not expect a returned object with a +1 retain " + "count since they expect the object to be managed by the garbage " + "collector"; } else os << " is no longer referenced after this point and has a retain count of" @@ -3073,11 +3074,12 @@ void CFRefCount::EvalReturn(ExplodedNodeSet& Dst, 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). + // 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 = false; + hasError = true; } else if (!RE.isOwned()) { // Either we are using GC and the returned object is a CF type -- cgit v1.2.3