diff options
| -rw-r--r-- | lib/Checker/RegionStore.cpp | 14 | ||||
| -rw-r--r-- | test/Analysis/misc-ps.m | 18 |
2 files changed, 23 insertions, 9 deletions
diff --git a/lib/Checker/RegionStore.cpp b/lib/Checker/RegionStore.cpp index c08be0cff6..a6646436d5 100644 --- a/lib/Checker/RegionStore.cpp +++ b/lib/Checker/RegionStore.cpp @@ -1054,7 +1054,7 @@ RegionStoreManager::GetLazyBinding(RegionBindings B, const MemRegion *R) { const std::pair<Store, const MemRegion *> &X = GetLazyBinding(B, ER->getSuperRegion()); - if (X.first) + if (X.second) return std::make_pair(X.first, MRMgr.getElementRegionWithSuper(ER, X.second)); } @@ -1062,7 +1062,7 @@ RegionStoreManager::GetLazyBinding(RegionBindings B, const MemRegion *R) { const std::pair<Store, const MemRegion *> &X = GetLazyBinding(B, FR->getSuperRegion()); - if (X.first) + if (X.second) return std::make_pair(X.first, MRMgr.getFieldRegionWithSuper(FR, X.second)); } @@ -1179,13 +1179,9 @@ SVal RegionStoreManager::RetrieveFieldOrElementCommon(Store store, const MemRegion *lazyBindingRegion = NULL; llvm::tie(lazyBindingStore, lazyBindingRegion) = GetLazyBinding(B, R); - if (lazyBindingStore) { - assert(lazyBindingRegion && "Lazy-binding region not set"); - - if (isa<ElementRegion>(R)) - return RetrieveElement(lazyBindingStore, - cast<ElementRegion>(lazyBindingRegion)); - + if (lazyBindingRegion) { + if (const ElementRegion *ER = dyn_cast<ElementRegion>(lazyBindingRegion)) + return RetrieveElement(lazyBindingStore, ER); return RetrieveField(lazyBindingStore, cast<FieldRegion>(lazyBindingRegion)); } diff --git a/test/Analysis/misc-ps.m b/test/Analysis/misc-ps.m index 20eed9cb3d..fa05f6f603 100644 --- a/test/Analysis/misc-ps.m +++ b/test/Analysis/misc-ps.m @@ -915,3 +915,21 @@ void rdar7582031_test_static_init_zero_b() { int *p = 0; *p = 0xDEADBEEF; } + +//===----------------------------------------------------------------------===// +// Test handling of parameters that are structs that contain floats and // +// nested fields. // +//===----------------------------------------------------------------------===// + +struct s_rev95547_nested { float x, y; }; +struct s_rev95547 { + struct s_rev95547_nested z1; + struct s_rev95547_nested z2; +}; +float foo_rev95547(struct s_rev95547 w) { + return w.z1.x + 20.0; // no-warning +} +void foo_rev95547_b(struct s_rev95547 w) { + struct s_rev95547 w2 = w; + w2.z1.x += 20.0; // no-warning +} |