diff options
| -rw-r--r-- | lib/StaticAnalyzer/Core/SValBuilder.cpp | 9 | ||||
| -rw-r--r-- | test/Analysis/casts.m | 20 |
2 files changed, 27 insertions, 2 deletions
diff --git a/lib/StaticAnalyzer/Core/SValBuilder.cpp b/lib/StaticAnalyzer/Core/SValBuilder.cpp index e17f0bee20..ebf7ae2fd4 100644 --- a/lib/StaticAnalyzer/Core/SValBuilder.cpp +++ b/lib/StaticAnalyzer/Core/SValBuilder.cpp @@ -213,8 +213,13 @@ SVal SValBuilder::evalCast(SVal val, QualType castTy, QualType originalTy) { return UnknownVal(); // Check for casts from integers to integers. - if (castTy->isIntegerType() && originalTy->isIntegerType()) - return evalCastFromNonLoc(cast<NonLoc>(val), castTy); + if (castTy->isIntegerType() && originalTy->isIntegerType()) { + if (isa<Loc>(val)) + // This can be a cast to ObjC property of type int. + return evalCastFromLoc(cast<Loc>(val), castTy); + else + return evalCastFromNonLoc(cast<NonLoc>(val), castTy); + } // Check for casts from pointers to integers. if (castTy->isIntegerType() && Loc::isLocType(originalTy)) diff --git a/test/Analysis/casts.m b/test/Analysis/casts.m index b19ead4b05..c4edc044b8 100644 --- a/test/Analysis/casts.m +++ b/test/Analysis/casts.m @@ -19,3 +19,23 @@ void* test2(void *p) { MyFuncTest1 fp = (MyFuncTest1) p; return (*fp)(); } + +// <radar://10087620> +// A cast from int onjective C property reference to int. +typedef signed char BOOL; +@protocol NSObject - (BOOL)isEqual:(id)object; @end +@interface NSObject <NSObject> {} - (id)init; @end +typedef enum { + AIMediaTypeAudio, + AIMediaTypeVideo +} AIMediaType; +@interface AIMedia : NSObject { + AIMediaType mediaType; +} +@property (readwrite, nonatomic) AIMediaType mediaType; +static void +adium_media_ready_cb(AIMedia *adiumMedia, const char *sid) +{ + adiumMedia.mediaType |= AIMediaTypeVideo; +} +@end
\ No newline at end of file |