commit d37e8c37ce6df14feb1857e33c548a1e6530c0e4
author Ted Kremenek <kremenek@apple.com> Mon Jul 06 18:30:43 2009 +0000
committer Ted Kremenek <kremenek@apple.com> Mon Jul 06 18:30:43 2009 +0000
tree 8dd59ca26819ecb8c9b070e88760a3bfe466adb5
parent cb0a7f740d35c61cf51e6be64d937b6943db6c85

Fix <rdar://problem/7033733>.  The CF_RETURNS_RETAINED attribute should work if the return type on an Objective-C method is a CF type reference, not just an Objective-C object reference.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@74841 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Analysis/CFRefCount.cpp

diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index c8919c3..d3d0545 100644
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -1267,15 +1267,23 @@
   if (!MD)
     return;
 
+  bool isTrackedLoc = false;
+  
   // Determine if there is a special return effect for this method.
   if (isTrackedObjCObjectType(MD->getResultType())) {
     if (MD->getAttr<NSReturnsRetainedAttr>()) {
       Summ.setRetEffect(ObjCAllocRetE);
+      return;
     }
-    else if (MD->getAttr<CFReturnsRetainedAttr>()) {
-      Summ.setRetEffect(RetEffect::MakeOwned(RetEffect::CF, true));
-    }
+    
+    isTrackedLoc = true;
   }
+  
+  if (!isTrackedLoc)
+    isTrackedLoc = MD->getResultType()->getAsPointerType() != NULL;
+    
+  if (isTrackedLoc && MD->getAttr<CFReturnsRetainedAttr>())
+    Summ.setRetEffect(RetEffect::MakeOwned(RetEffect::CF, true));
 }
 
 RetainSummary*

test/Analysis/retain-release.m

diff --git a/test/Analysis/retain-release.m b/test/Analysis/retain-release.m
index da0ae80..6347014 100644
--- a/test/Analysis/retain-release.m
+++ b/test/Analysis/retain-release.m
@@ -815,7 +815,9 @@
 
 @interface MyClassTestCFAttr : NSObject {}
 - (NSDate*) returnsCFRetained __attribute__((cf_returns_retained));
+- (CFDateRef) returnsCFRetainedAsCF __attribute__((cf_returns_retained));
 - (NSDate*) alsoReturnsRetained;
+- (CFDateRef) alsoReturnsRetainedAsCF;
 - (NSDate*) returnsNSRetained __attribute__((ns_returns_retained));
 @end
 
@@ -829,10 +831,20 @@
   return (NSDate*) returnsRetainedCFDate(); // No leak.
 }
 
+- (CFDateRef) returnsCFRetainedAsCF {
+  return returnsRetainedCFDate(); // No leak.
+}
+
+
 - (NSDate*) alsoReturnsRetained {
   return (NSDate*) returnsRetainedCFDate(); // expected-warning{{leak}}
 }
 
+- (CFDateRef) alsoReturnsRetainedAsCF {
+  return returnsRetainedCFDate(); // expected-warning{{leak}}
+}
+
+
 - (NSDate*) returnsNSRetained {
   return (NSDate*) returnsRetainedCFDate(); // no-warning
 }