diff options
| -rw-r--r-- | lib/Analysis/CFRefCount.cpp | 10 | ||||
| -rw-r--r-- | test/Analysis/uninit-vals-ps.c | 22 |
2 files changed, 29 insertions, 3 deletions
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp index e044d1d789..c85d934ebb 100644 --- a/lib/Analysis/CFRefCount.cpp +++ b/lib/Analysis/CFRefCount.cpp @@ -1599,6 +1599,14 @@ void CFRefCount::EvalSummary(ExplodedNodeSet<GRState>& Dst, } const TypedRegion* R = dyn_cast<TypedRegion>(MR->getRegion()); + + // Blast through AnonTypedRegions to get the original region type. + while (R) { + const AnonTypedRegion* ATR = dyn_cast<AnonTypedRegion>(R); + if (!ATR) break; + R = dyn_cast<TypedRegion>(ATR->getSuperRegion()); + } + if (R) { // Set the value of the variable to be a conjured symbol. unsigned Count = Builder.getCurrentBlockCount(); @@ -1609,7 +1617,7 @@ void CFRefCount::EvalSummary(ExplodedNodeSet<GRState>& Dst, SymbolRef NewSym = Eng.getSymbolManager().getConjuredSymbol(*I, T, Count); - state = state.BindLoc(*MR, + state = state.BindLoc(Loc::MakeVal(R), Loc::IsLocType(T) ? cast<SVal>(loc::SymbolVal(NewSym)) : cast<SVal>(nonloc::SymbolVal(NewSym))); diff --git a/test/Analysis/uninit-vals-ps.c b/test/Analysis/uninit-vals-ps.c index 58f64311f2..b860000929 100644 --- a/test/Analysis/uninit-vals-ps.c +++ b/test/Analysis/uninit-vals-ps.c @@ -1,5 +1,5 @@ -// RUN: clang -checker-simple -verify %s && -// RUN: clang -checker-simple -analyzer-store-region -verify %s +// RUN: clang -checker-cfref -verify %s && +// RUN: clang -checker-cfref -analyzer-store-region -verify %s struct FPRec { void (*my_func)(int * x); @@ -49,4 +49,22 @@ int ret_uninit() { return *p; // expected-warning{{Uninitialized or undefined return value returned to caller.}} } +// <rdar://problem/6451816> +typedef unsigned char Boolean; +typedef const struct __CFNumber * CFNumberRef; +typedef signed long CFIndex; +typedef CFIndex CFNumberType; +typedef unsigned long UInt32; +typedef UInt32 CFStringEncoding; +typedef const struct __CFString * CFStringRef; +extern Boolean CFNumberGetValue(CFNumberRef number, CFNumberType theType, void *valuePtr); +extern CFStringRef CFStringConvertEncodingToIANACharSetName(CFStringEncoding encoding); + +CFStringRef rdar_6451816(CFNumberRef nr) { + CFStringEncoding encoding; + // &encoding is casted to void*. This test case tests whether or not + // we properly invalidate the value of 'encoding'. + CFNumberGetValue(nr, 9, &encoding); + return CFStringConvertEncodingToIANACharSetName(encoding); // no-warning +} |