diff options
| -rw-r--r-- | lib/Analysis/RegionStore.cpp | 3 | ||||
| -rw-r--r-- | test/Analysis/fields.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp index 0fc24a9a2b..a66e63c877 100644 --- a/lib/Analysis/RegionStore.cpp +++ b/lib/Analysis/RegionStore.cpp @@ -616,7 +616,8 @@ RegionStoreManager::CastRegion(const GRState* state, const MemRegion* R, uint64_t PointeeTySize = getContext().getTypeSize(PointeeTy); uint64_t ObjTySize = getContext().getTypeSize(ObjTy); - if (PointeeTySize > 0 && PointeeTySize < ObjTySize) { + if ((PointeeTySize > 0 && PointeeTySize < ObjTySize) || + (ObjTy->isAggregateType() && PointeeTy->isScalarType())) { // Record the cast type of the region. state = setCastType(state, R, ToTy); diff --git a/test/Analysis/fields.c b/test/Analysis/fields.c index 8b88578a0e..c012a9da7b 100644 --- a/test/Analysis/fields.c +++ b/test/Analysis/fields.c @@ -1,6 +1,5 @@ // RUN: clang-cc -analyze -checker-cfref %s --analyzer-store=basic -verify && // RUN: clang-cc -analyze -checker-cfref %s --analyzer-store=region -verify -// XFAIL unsigned foo(); typedef struct bf { unsigned x:2; } bf; |