Author: kremenek
Date: Fri Aug 28 14:52:12 2009
New Revision: 80387
URL: http://llvm.org/viewvc/llvm-project?rev=80387&view=rev
Log:
retain/release checker: [CIContext createCGImage...] and friends returned CF
objects that are not automatically garbage collected. This fixes
<rdar://problem/7174400>.
Modified:
cfe/trunk/lib/Analysis/CFRefCount.cpp
cfe/trunk/test/Analysis/retain-release-gc-only.m
Modified: cfe/trunk/lib/Analysis/CFRefCount.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/CFRefCount.cpp?rev=80387&r1=80386&r2=80387&view=diff
==============================================================================
--- cfe/trunk/lib/Analysis/CFRefCount.cpp (original)
+++ cfe/trunk/lib/Analysis/CFRefCount.cpp Fri Aug 28 14:52:12 2009
@@ -1461,7 +1461,9 @@
InitSumm);
// The next methods are allocators.
- RetainSummary *AllocSumm = getPersistentSummary(ObjCAllocRetE);
+ RetainSummary *AllocSumm = getPersistentSummary(ObjCAllocRetE);
+ RetainSummary *CFAllocSumm =
+ getPersistentSummary(RetEffect::MakeOwned(RetEffect::CF, true));
// Create the "copy" selector.
addNSObjectMethSummary(GetNullarySelector("copy", Ctx), AllocSumm);
@@ -1547,12 +1549,13 @@
"createSnapshotImageOfType", NULL);
// Create summaries for CIContext, 'createCGImage' and
- // 'createCGLayerWithSize'.
- addInstMethSummary("CIContext", AllocSumm,
+ // 'createCGLayerWithSize'. These objects are CF objects, and are not
+ // automatically garbage collected.
+ addInstMethSummary("CIContext", CFAllocSumm,
"createCGImage", "fromRect", NULL);
- addInstMethSummary("CIContext", AllocSumm,
+ addInstMethSummary("CIContext", CFAllocSumm,
"createCGImage", "fromRect", "format", "colorSpace",
NULL);
- addInstMethSummary("CIContext", AllocSumm, "createCGLayerWithSize",
+ addInstMethSummary("CIContext", CFAllocSumm, "createCGLayerWithSize",
"info", NULL);
}
Modified: cfe/trunk/test/Analysis/retain-release-gc-only.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/retain-release-gc-only.m?rev=80387&r1=80386&r2=80387&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/retain-release-gc-only.m (original)
+++ cfe/trunk/test/Analysis/retain-release-gc-only.m Fri Aug 28 14:52:12 2009
@@ -5,12 +5,22 @@
// Header stuff.
//===----------------------------------------------------------------------===//
-typedef struct objc_class *Class;
-
typedef unsigned int __darwin_natural_t;
-typedef struct {} div_t;
-typedef unsigned long UInt32;
+typedef unsigned long uintptr_t;
+typedef unsigned int uint32_t;
+typedef unsigned long long uint64_t;
+typedef unsigned int UInt32;
typedef signed long CFIndex;
+typedef struct {
+ CFIndex location;
+ CFIndex length;
+} CFRange;
+static __inline__ __attribute__((always_inline)) CFRange CFRangeMake(CFIndex
loc, CFIndex len) {
+ CFRange range;
+ range.location = loc;
+ range.length = len;
+ return range;
+}
typedef const void * CFTypeRef;
typedef const struct __CFString * CFStringRef;
typedef const struct __CFAllocator * CFAllocatorRef;
@@ -26,7 +36,17 @@
extern CFMutableArrayRef CFArrayCreateMutable(CFAllocatorRef allocator,
CFIndex capacity, const CFArrayCallBacks *callBacks);
extern const void *CFArrayGetValueAtIndex(CFArrayRef theArray, CFIndex idx);
extern void CFArrayAppendValue(CFMutableArrayRef theArray, const void *value);
+typedef struct {
+}
+CFDictionaryKeyCallBacks;
+extern const CFDictionaryKeyCallBacks kCFTypeDictionaryKeyCallBacks;
+typedef struct {
+}
+CFDictionaryValueCallBacks;
+extern const CFDictionaryValueCallBacks kCFTypeDictionaryValueCallBacks;
typedef const struct __CFDictionary * CFDictionaryRef;
+typedef struct __CFDictionary * CFMutableDictionaryRef;
+extern CFMutableDictionaryRef CFDictionaryCreateMutable(CFAllocatorRef
allocator, CFIndex capacity, const CFDictionaryKeyCallBacks *keyCallBacks,
const CFDictionaryValueCallBacks *valueCallBacks);
typedef UInt32 CFStringEncoding;
enum {
kCFStringEncodingMacRoman = 0, kCFStringEncodingWindowsLatin1 = 0x0500,
kCFStringEncodingISOLatin1 = 0x0201, kCFStringEncodingNextStepLatin =
0x0B01, kCFStringEncodingASCII = 0x0600, kCFStringEncodingUnicode =
0x0100, kCFStringEncodingUTF8 = 0x08000100,
kCFStringEncodingNonLossyASCII = 0x0BFF , kCFStringEncodingUTF16 =
0x0100, kCFStringEncodingUTF16BE = 0x10000100, kCFStringEncodingUTF16LE
= 0x14000100, kCFStringEncodingUTF32 = 0x0c000100,
kCFStringEncodingUTF32BE = 0x18000100, kCFStringEncodingUTF32LE =
0x1c000100 };
@@ -40,44 +60,96 @@
typedef __darwin_natural_t natural_t;
typedef natural_t mach_port_name_t;
typedef mach_port_name_t mach_port_t;
-typedef struct {
-}
-CFRunLoopObserverContext;
+typedef int kern_return_t;
+typedef kern_return_t mach_error_t;
+enum {
+kCFNumberSInt8Type = 1, kCFNumberSInt16Type = 2, kCFNumberSInt32Type =
3, kCFNumberSInt64Type = 4, kCFNumberFloat32Type = 5,
kCFNumberFloat64Type = 6, kCFNumberCharType = 7, kCFNumberShortType =
8, kCFNumberIntType = 9, kCFNumberLongType = 10,
kCFNumberLongLongType = 11, kCFNumberFloatType = 12,
kCFNumberDoubleType = 13, kCFNumberCFIndexType = 14,
kCFNumberNSIntegerType = 15, kCFNumberCGFloatType = 16,
kCFNumberMaxType = 16 };
+typedef CFIndex CFNumberType;
+typedef const struct __CFNumber * CFNumberRef;
+extern CFNumberRef CFNumberCreate(CFAllocatorRef allocator, CFNumberType
theType, const void *valuePtr);
+typedef const struct __CFAttributedString *CFAttributedStringRef;
+typedef struct __CFAttributedString *CFMutableAttributedStringRef;
+extern CFAttributedStringRef CFAttributedStringCreate(CFAllocatorRef alloc,
CFStringRef str, CFDictionaryRef attributes) ;
+extern CFMutableAttributedStringRef
CFAttributedStringCreateMutableCopy(CFAllocatorRef alloc, CFIndex maxLength,
CFAttributedStringRef aStr) ;
+extern void CFAttributedStringSetAttribute(CFMutableAttributedStringRef aStr,
CFRange range, CFStringRef attrName, CFTypeRef value) ;
typedef signed char BOOL;
-typedef unsigned int NSUInteger;
+typedef unsigned long NSUInteger;
@class NSString, Protocol;
extern void NSLog(NSString *format, ...) __attribute__((format(__NSString__,
1, 2)));
typedef struct _NSZone NSZone;
@class NSInvocation, NSMethodSignature, NSCoder, NSString, NSEnumerator;
-...@protocol NSObject - (BOOL)isEqual:(id)object;
+...@protocol NSObject
+- (BOOL)isEqual:(id)object;
- (id)retain;
- (oneway void)release;
- (id)autorelease;
+- (Class)class;
@end @protocol NSCopying - (id)copyWithZone:(NSZone *)zone;
@end @protocol NSMutableCopying - (id)mutableCopyWithZone:(NSZone *)zone;
@end @protocol NSCoding - (void)encodeWithCoder:(NSCoder *)aCoder;
@end
@interface NSObject <NSObject> {}
-- (Class)class;
-+ (id)alloc;
+ (id)allocWithZone:(NSZone *)zone;
-...@end typedef float CGFloat;
++ (id)alloc;
+- (void)dealloc;
+...@end
+...@interface NSObject (NSCoderMethods)
+- (id)awakeAfterUsingCoder:(NSCoder *)aDecoder;
+...@end
+extern id NSAllocateObject(Class aClass, NSUInteger extraBytes, NSZone *zone);
+typedef struct {
+}
+NSFastEnumerationState;
+...@protocol NSFastEnumeration -
(NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state
objects:(id *)stackbuf count:(NSUInteger)len;
+...@end @class NSString, NSDictionary;
+...@interface NSValue : NSObject <NSCopying, NSCoding> - (void)getValue:(void
*)value;
+...@end @interface NSNumber : NSValue - (char)charValue;
+- (id)initWithInt:(int)value;
+...@end @class NSString;
+...@interface NSArray : NSObject <NSCopying, NSMutableCopying, NSCoding,
NSFastEnumeration> - (NSUInteger)count;
+...@end @interface NSArray (NSArrayCreation) + (id)array;
+...@end @interface NSAutoreleasePool : NSObject {
+}
+- (void)drain;
+...@end extern NSString * const NSBundleDidLoadNotification;
+typedef double NSTimeInterval;
+...@interface NSDate : NSObject <NSCopying, NSCoding> -
(NSTimeInterval)timeIntervalSinceReferenceDate;
+...@end typedef unsigned short unichar;
@interface NSString : NSObject <NSCopying, NSMutableCopying, NSCoding> -
(NSUInteger)length;
-- (const char *)UTF8String;
+- ( const char *)UTF8String;
- (id)initWithUTF8String:(const char *)nullTerminatedCString;
+ (id)stringWithUTF8String:(const char *)nullTerminatedCString;
-- (id)init;
-- (void)dealloc;
-...@end extern NSString * const NSCurrentLocaleDidChangeNotification ;
-...@protocol NSLocking - (void)lock;
-...@end extern NSString * const NSUndoManagerCheckpointNotification;
-typedef enum {
-ACL_READ_DATA = (1<<1), ACL_LIST_DIRECTORY = (1<<1), ACL_WRITE_DATA =
(1<<2), ACL_ADD_FILE = (1<<2), ACL_EXECUTE = (1<<3), ACL_SEARCH = (1<<3),
ACL_DELETE = (1<<4), ACL_APPEND_DATA = (1<<5), ACL_ADD_SUBDIRECTORY = (1<<5),
ACL_DELETE_CHILD = (1<<6), ACL_READ_ATTRIBUTES = (1<<7),
ACL_WRITE_ATTRIBUTES = (1<<8), ACL_READ_EXTATTRIBUTES = (1<<9),
ACL_WRITE_EXTATTRIBUTES = (1<<10), ACL_READ_SECURITY = (1<<11),
ACL_WRITE_SECURITY = (1<<12), ACL_CHANGE_OWNER = (1<<13) }
-acl_entry_id_t;
-typedef int kern_return_t;
-typedef kern_return_t mach_error_t;
+...@end @class NSString, NSURL, NSError;
+...@interface NSData : NSObject <NSCopying, NSMutableCopying, NSCoding> -
(NSUInteger)length;
++ (id)dataWithBytesNoCopy:(void *)bytes length:(NSUInteger)length;
++ (id)dataWithBytesNoCopy:(void *)bytes length:(NSUInteger)length
freeWhenDone:(BOOL)b;
+...@end @class NSLocale, NSDate, NSCalendar, NSTimeZone, NSError, NSArray,
NSMutableDictionary;
+...@interface NSDictionary : NSObject <NSCopying, NSMutableCopying, NSCoding,
NSFastEnumeration> - (NSUInteger)count;
+...@end @interface NSMutableDictionary : NSDictionary -
(void)removeObjectForKey:(id)aKey;
+- (void)setObject:(id)anObject forKey:(id)aKey;
+...@end @interface NSMutableDictionary (NSMutableDictionaryCreation) +
(id)dictionaryWithCapacity:(NSUInteger)numItems;
+...@end typedef double CGFloat;
+struct CGSize {
+};
+typedef struct CGSize CGSize;
+struct CGRect {
+};
+typedef struct CGRect CGRect;
typedef mach_port_t io_object_t;
+typedef char io_name_t[128];
+typedef io_object_t io_iterator_t;
typedef io_object_t io_service_t;
+typedef struct IONotificationPort * IONotificationPortRef;
+typedef void (*IOServiceMatchingCallback)( void * refcon, io_iterator_t
iterator );
+io_service_t IOServiceGetMatchingService( mach_port_t masterPort,
CFDictionaryRef matching );
+kern_return_t IOServiceGetMatchingServices( mach_port_t masterPort,
CFDictionaryRef matching, io_iterator_t * existing );
+kern_return_t IOServiceAddNotification( mach_port_t masterPort, const
io_name_t notificationType, CFDictionaryRef matching, mach_port_t wakePort,
uintptr_t reference, io_iterator_t * notification )
__attribute__((deprecated));
+kern_return_t IOServiceAddMatchingNotification( IONotificationPortRef
notifyPort, const io_name_t notificationType, CFDictionaryRef matching,
IOServiceMatchingCallback callback, void * refCon, io_iterator_t *
notification );
+CFMutableDictionaryRef IOServiceMatching( const char * name );
+CFMutableDictionaryRef IOServiceNameMatching( const char * name );
+CFMutableDictionaryRef IOBSDNameMatching( mach_port_t masterPort, uint32_t
options, const char * bsdName );
+CFMutableDictionaryRef IOOpenFirmwarePathMatching( mach_port_t masterPort,
uint32_t options, const char * path );
+CFMutableDictionaryRef IORegistryEntryIDMatching( uint64_t entryID );
typedef struct __DASession * DASessionRef;
extern DASessionRef DASessionCreate( CFAllocatorRef allocator );
typedef struct __DADisk * DADiskRef;
@@ -85,23 +157,62 @@
extern DADiskRef DADiskCreateFromIOMedia( CFAllocatorRef allocator,
DASessionRef session, io_service_t media );
extern CFDictionaryRef DADiskCopyDescription( DADiskRef disk );
extern DADiskRef DADiskCopyWholeDisk( DADiskRef disk );
+...@interface NSTask : NSObject - (id)init;
+...@end typedef struct CGColorSpace *CGColorSpaceRef;
+typedef struct CGImage *CGImageRef;
+typedef struct CGLayer *CGLayerRef;
@interface NSResponder : NSObject <NSCoding> {
}
-...@end @class NSColor, NSFont, NSNotification;
-typedef struct __CFlags {
+...@end @protocol NSAnimatablePropertyContainer - (id)animator;
+...@end extern NSString *NSAnimationTriggerOrderIn ;
+...@interface NSView : NSResponder <NSAnimatablePropertyContainer> {
}
-_CFlags;
+...@end @protocol NSValidatedUserInterfaceItem - (SEL)action;
+...@end @protocol NSUserInterfaceValidations -
(BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem;
+...@end @class NSDate, NSDictionary, NSError, NSException, NSNotification;
+...@interface NSApplication : NSResponder <NSUserInterfaceValidations> {
+}
+...@end enum {
+NSTerminateCancel = 0, NSTerminateNow = 1, NSTerminateLater =
2 };
+typedef NSUInteger NSApplicationTerminateReply;
+...@protocol NSApplicationDelegate <NSObject> @optional -
(NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
+...@end @class NSAttributedString, NSEvent, NSFont, NSFormatter, NSImage,
NSMenu, NSText, NSView, NSTextView;
@interface NSCell : NSObject <NSCopying, NSCoding> {
}
-...@end @class NSDate, NSDictionary, NSError, NSException, NSNotification;
-...@interface NSManagedObjectContext : NSObject <NSCoding, NSLocking> {
+...@end @class NSTextField, NSPanel, NSArray, NSWindow, NSImage, NSButton,
NSError;
+typedef struct {
}
-...@end enum {
+CVTimeStamp;
+...@interface CIImage : NSObject <NSCoding, NSCopying> {
+}
+typedef int CIFormat;
+...@end enum {
kDAReturnSuccess = 0, kDAReturnError = (((0x3e)&0x3f)<<26) |
(((0x368)&0xfff)<<14) | 0x01, kDAReturnBusy = (((0x3e)&0x3f)<<26) |
(((0x368)&0xfff)<<14) | 0x02, kDAReturnBadArgument = (((0x3e)&0x3f)<<26) |
(((0x368)&0xfff)<<14) | 0x03, kDAReturnExclusiveAccess =
(((0x3e)&0x3f)<<26) | (((0x368)&0xfff)<<14) | 0x04, kDAReturnNoResources =
(((0x3e)&0x3f)<<26) | (((0x368)&0xfff)<<14) | 0x05, kDAReturnNotFound =
(((0x3e)&0x3f)<<26) | (((0x368)&0xfff)<<14) | 0x06, kDAReturnNotMounted =
(((0x3e)&0x3f)<<26) | (((0x368)&0xfff)<<14) | 0x07, kDAReturnNotPermitted =
(((0x3e)&0x3f)<<26) | (((0x368)&0xfff)<<14) | 0x08, kDAReturnNotPrivileged
= (((0x3e)&0x3f)<<26) | (((0x368)&0xfff)<<14) | 0x09, kDAReturnNotReady =
(((0x3e)&0x3f)<<26) | (((0x368)&0xfff)<<14) | 0x0A, kDAReturnNotWritable =
(((0x3e)&0x3f)<<26) | (((0x368)&0xfff)<<14) | 0x0B, kDAReturnUnsupported =
(((0x3e)&0x3f)<<26) | (((0x368)&0xfff)<<14) | 0x0C };
typedef mach_error_t DAReturn;
typedef const struct __DADissenter * DADissenterRef;
extern DADissenterRef DADissenterCreate( CFAllocatorRef allocator, DAReturn
status, CFStringRef string );
-
+...@interface CIContext: NSObject {
+}
+- (CGImageRef)createCGImage:(CIImage *)im fromRect:(CGRect)r;
+- (CGImageRef)createCGImage:(CIImage *)im fromRect:(CGRect)r
format:(CIFormat)f colorSpace:(CGColorSpaceRef)cs;
+- (CGLayerRef)createCGLayerWithSize:(CGSize)size info:(CFDictionaryRef)d;
+...@end extern NSString* const QCRendererEventKey;
+...@protocol QCCompositionRenderer - (NSDictionary*) attributes;
+...@end @interface QCRenderer : NSObject <QCCompositionRenderer> {
+}
+- (id) createSnapshotImageOfType:(NSString*)type;
+...@end extern NSString* const QCViewDidStartRenderingNotification;
+...@interface QCView : NSView <QCCompositionRenderer> {
+}
+- (id) createSnapshotImageOfType:(NSString*)type;
+...@end enum {
+ICEXIFOrientation1 = 1, ICEXIFOrientation2 = 2, ICEXIFOrientation3 =
3, ICEXIFOrientation4 = 4, ICEXIFOrientation5 = 5,
ICEXIFOrientation6 = 6, ICEXIFOrientation7 = 7, ICEXIFOrientation8 = 8,
};
+...@class ICDevice;
+...@protocol ICDeviceDelegate <NSObject> @required -
(void)didRemoveDevice:(ICDevice*)device;
+...@end extern NSString *const ICScannerStatusWarmingUp;
+...@class ICScannerDevice;
+...@protocol ICScannerDeviceDelegate <ICDeviceDelegate> @optional -
(void)scannerDeviceDidBecomeAvailable:(ICScannerDevice*)scanner;
+...@end
CFTypeRef CFMakeCollectable(CFTypeRef cf) ;
static __inline__ __attribute__((always_inline)) id
NSMakeCollectable(CFTypeRef
@@ -198,6 +309,19 @@
@end
//===----------------------------------------------------------------------===//
+// <rdar://problem/7174400> 'ciContext createCGImage:outputImage fromRect:'
returns a retained CF object (not
GC'ed)//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===//
+
+void rdar_7174400(QCView *view, QCRenderer *renderer, CIContext *context,
+ NSString *str, CIImage *img, CGRect rect,
+ CIFormat form, CGColorSpaceRef cs) {
+ [view createSnapshotImageOfType:str]; // no-warning
+ [renderer createSnapshotImageOfType:str]; // no-warning
+ [context createCGImage:img fromRect:rect]; // expected-warning{{leak}}
+ [context createCGImage:img fromRect:rect format:form colorSpace:cs]; //
expected-warning{{leak}}
+}
+
+//===----------------------------------------------------------------------===//
// Tests of ownership attributes.
//===----------------------------------------------------------------------===//
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
