diff options
author | Anna Zaks <ganna@apple.com> | 2012-03-30 05:48:16 +0000 |
---|---|---|
committer | Anna Zaks <ganna@apple.com> | 2012-03-30 05:48:16 +0000 |
commit | 62a5c34ddc54696725683f6c5af1c8e1592c5c38 (patch) | |
tree | 7c2c115a6f3b65b2e075bd85903e72db89c3cff9 /test/Analysis | |
parent | 3bbd8cd831788c506f2980293eb3c7e1b3ca2501 (diff) |
[analyzer]Malloc,RetainRelease: Allow pointer to escape via NSMapInsert.
Fixes a false positive (radar://11152419). The current solution of
adding the info into 3 places is quite ugly. Pending a generic pointer
escapes callback.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153731 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Analysis')
-rw-r--r-- | test/Analysis/malloc.mm | 19 | ||||
-rw-r--r-- | test/Analysis/retain-release.mm | 19 | ||||
-rw-r--r-- | test/Analysis/system-header-simulator-objc.h | 1 |
3 files changed, 39 insertions, 0 deletions
diff --git a/test/Analysis/malloc.mm b/test/Analysis/malloc.mm index fe14edeedd..d2409ac160 100644 --- a/test/Analysis/malloc.mm +++ b/test/Analysis/malloc.mm @@ -106,6 +106,25 @@ void testBlocks() { myBlock(3); } +// Test NSMapInsert. +@interface NSMapTable : NSObject <NSCopying, NSCoding, NSFastEnumeration> +@end +extern void *NSMapGet(NSMapTable *table, const void *key); +extern void NSMapInsert(NSMapTable *table, const void *key, const void *value); +extern void NSMapInsertKnownAbsent(NSMapTable *table, const void *key, const void *value); +char *strdup(const char *s); + +NSString * radar11152419(NSString *string1, NSMapTable *map) { + const char *strkey = "key"; + NSString *string = ( NSString *)NSMapGet(map, strkey); + if (!string) { + string = [string1 copy]; + NSMapInsert(map, strdup(strkey), (void*)string); // no warning + NSMapInsertKnownAbsent(map, strdup(strkey), (void*)string); // no warning + } + return string; +} + // Test that we handle pointer escaping through OSAtomicEnqueue. typedef volatile struct { void *opaque1; diff --git a/test/Analysis/retain-release.mm b/test/Analysis/retain-release.mm index c463f8ada9..01727ea644 100644 --- a/test/Analysis/retain-release.mm +++ b/test/Analysis/retain-release.mm @@ -111,6 +111,7 @@ typedef struct _NSZone NSZone; @protocol NSObject - (BOOL)isEqual:(id)object; - (id)retain; +- (id)copy; - (oneway void)release; - (id)autorelease; @end @protocol NSCopying - (id)copyWithZone:(NSZone *)zone; @@ -347,3 +348,21 @@ int rdar10553686_positive(void) return 0; } +@interface NSMapTable : NSObject <NSCopying, NSCoding, NSFastEnumeration> +@end +extern void *NSMapGet(NSMapTable *table, const void *key); +extern void NSMapInsert(NSMapTable *table, const void *key, const void *value); +extern void NSMapInsertKnownAbsent(NSMapTable *table, const void *key, const void *value); +char *strdup(const char *s); + +NSString * radar11152419(NSString *string1, NSString *key1, NSMapTable *map) { + NSString *string = ( NSString *)NSMapGet(map, key1); + if (!string) { + string = [string1 copy]; + NSString *key = [key1 copy]; + NSMapInsert(map, (void*) key, (void*)string); // no warning + NSMapInsertKnownAbsent(map, (void*)key, (void*)string); // no warning + } + return string; +} + diff --git a/test/Analysis/system-header-simulator-objc.h b/test/Analysis/system-header-simulator-objc.h index 3fe21920ae..92d5899abf 100644 --- a/test/Analysis/system-header-simulator-objc.h +++ b/test/Analysis/system-header-simulator-objc.h @@ -39,6 +39,7 @@ typedef struct _NSZone NSZone; @protocol NSObject - (BOOL)isEqual:(id)object; - (id)retain; +- (id)copy; - (oneway void)release; - (id)autorelease; - (id)init; |