[cfe-commits] r57997 - in /cfe/trunk: lib/Analysis/CFRefCount.cpp test/Analysis/CGColorSpace.c

[Ted Kremenek]

Author: kremenek
Date: Wed Oct 22 15:54:52 2008
New Revision: 57997

URL: http://llvm.org/viewvc/llvm-project?rev=57997&view=rev
Log:
Enhance reference-count checker to correctly identify CG "release" functions.  This fixes <rdar://problem/6303488>.

Added:
    cfe/trunk/test/Analysis/CGColorSpace.c
Modified:
    cfe/trunk/lib/Analysis/CFRefCount.cpp

Modified: cfe/trunk/lib/Analysis/CFRefCount.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/CFRefCount.cpp?rev=57997&r1=57996&r2=57997&view=diff

==============================================================================
--- cfe/trunk/lib/Analysis/CFRefCount.cpp (original)
+++ cfe/trunk/lib/Analysis/CFRefCount.cpp Wed Oct 22 15:54:52 2008
@@ -704,8 +704,12 @@
       }
     }
 
-    if (FName[0] == 'C' && FName[1] == 'F')
-      S = getCFSummary(FD, FName);  
+    if (FName[0] == 'C') {
+      if (FName[1] == 'F')
+        S = getCFSummary(FD, FName);  
+      else if (FName[1] == 'G')
+        S = getCGSummary(FD, FName);
+    }
     else if (FName[0] == 'N' && FName[1] == 'S')
       S = getNSSummary(FD, FName);
   }
@@ -834,10 +838,14 @@
  
   FunctionType* FT =
     dyn_cast<FunctionType>(FD->getType().getTypePtr());
-  
-  if (FT && !isCFRefType(FT->getResultType()))
-    return getPersistentSummary(RetEffect::MakeNoRet());
 
+  if (FT) {
+    QualType ResTy = FT->getResultType();
+    
+    if (!isCFRefType(ResTy) && !isCGRefType(ResTy))
+      return getPersistentSummary(RetEffect::MakeNoRet());
+  }
+  
   assert (ScratchArgs.empty());
   
   if (FD->getIdentifier() == CFDictionaryCreateII) {

Added: cfe/trunk/test/Analysis/CGColorSpace.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/CGColorSpace.c?rev=57997&view=auto

==============================================================================
--- cfe/trunk/test/Analysis/CGColorSpace.c (added)
+++ cfe/trunk/test/Analysis/CGColorSpace.c Wed Oct 22 15:54:52 2008
@@ -0,0 +1,18 @@
+// clang -checker-cfref -verify %s
+
+typedef struct CGColorSpace *CGColorSpaceRef;
+extern CGColorSpaceRef CGColorSpaceCreateDeviceRGB(void);
+extern CGColorSpaceRef CGColorSpaceRetain(CGColorSpaceRef space);
+extern void CGColorSpaceRelease(CGColorSpaceRef space);
+
+void f() {
+  CGColorSpaceRef X = CGColorSpaceCreateDeviceRGB();
+  CGColorSpaceRetain(X);  // expected-warning{{leak}}
+}
+
+void fb() {
+  CGColorSpaceRef X = CGColorSpaceCreateDeviceRGB();
+  CGColorSpaceRetain(X);
+  CGColorSpaceRelease(X);
+  CGColorSpaceRelease(X);  // no-warning
+}