diff options
| -rw-r--r-- | lib/Analysis/Store.cpp | 8 | ||||
| -rw-r--r-- | test/Analysis/misc-ps.m | 11 |
2 files changed, 19 insertions, 0 deletions
diff --git a/lib/Analysis/Store.cpp b/lib/Analysis/Store.cpp index bd46a68d01..bddf05465a 100644 --- a/lib/Analysis/Store.cpp +++ b/lib/Analysis/Store.cpp @@ -258,6 +258,13 @@ const GRState *StoreManager::InvalidateRegion(const GRState *state, const TypedRegion *TR = cast<TypedRegion>(R); QualType T = TR->getValueType(Ctx); + // FIXME: The code causes a crash when using RegionStore on the test case + // 'test_invalidate_cast_int' (misc-ps.m). Consider removing it + // permanently. Region casts are probably not too strict to handle + // the transient interpretation of memory. Instead we can use the QualType + // passed to 'Retrieve' and friends to determine the most current + // interpretation of memory when it is actually used. +#if 0 // If the region is cast to another type, use that type. if (const QualType *CastTy = getCastType(state, R)) { assert(!(*CastTy)->isObjCObjectPointerType()); @@ -270,6 +277,7 @@ const GRState *StoreManager::InvalidateRegion(const GRState *state, if (!(Loc::IsLocType(T) && !Loc::IsLocType(NewT))) T = NewT; } +#endif if (Loc::IsLocType(T) || (T->isIntegerType() && T->isScalarType())) { SVal V = ValMgr.getConjuredSymbolVal(E, T, Count); diff --git a/test/Analysis/misc-ps.m b/test/Analysis/misc-ps.m index de39a0004b..e2c0e05b92 100644 --- a/test/Analysis/misc-ps.m +++ b/test/Analysis/misc-ps.m @@ -459,3 +459,14 @@ void PR4594() { char **foo = buf; *foo = "test"; } + +// Test invalidation logic where an integer is casted to an array with a +// different sign and then invalidated. +void test_invalidate_cast_int() { + void test_invalidate_cast_int_aux(unsigned *i); + signed i; + test_invalidate_cast_int_aux((unsigned*) &i); + if (i < 0) + return; +} + |