wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed crash with initializer lists and unnamed bitfields in the RegionStore 

Manager. Added test to ensure proper binding of initialized values.
This patch fixes PR11249.

llvm-svn: 144831
This commit is contained in:
Jim Goodnow II 2011-11-16 20:29:27 +00:00
parent 9dc3212f98
commit 8d21fc8239
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/StaticAnalyzer/Core/RegionStore.cpp
View File

@ -1506,11 +1506,15 @@ StoreRef RegionStoreManager::BindStruct(Store store, const TypedValueRegion* R,
RecordDecl::field_iterator FI, FE; RecordDecl::field_iterator FI, FE;
StoreRef newStore(store, *this); StoreRef newStore(store, *this);
for (FI = RD->field_begin(), FE = RD->field_end(); FI != FE; ++FI, ++VI) { for (FI = RD->field_begin(), FE = RD->field_end(); FI != FE; ++FI) {
if (VI == VE) if (VI == VE)
break; break;
// Skip any unnamed bitfields to stay in sync with the initializers.
if ((*FI)->isUnnamedBitfield())
continue;
QualType FTy = (*FI)->getType(); QualType FTy = (*FI)->getType();
const FieldRegion* FR = MRMgr.getFieldRegion(*FI, R); const FieldRegion* FR = MRMgr.getFieldRegion(*FI, R);
@ -1520,6 +1524,7 @@ StoreRef RegionStoreManager::BindStruct(Store store, const TypedValueRegion* R,
newStore = BindStruct(newStore.getStore(), FR, *VI); newStore = BindStruct(newStore.getStore(), FR, *VI);
else else
newStore = Bind(newStore.getStore(), svalBuilder.makeLoc(FR), *VI); newStore = Bind(newStore.getStore(), svalBuilder.makeLoc(FR), *VI);
++VI;
} }
// There may be fewer values in the initialize list than the fields of struct. // There may be fewer values in the initialize list than the fields of struct.

17
clang/test/Analysis/misc-ps-region-store.cpp
View File

@ -466,4 +466,21 @@ void rdar10202899_test3() {
*p = 0xDEADBEEF; *p = 0xDEADBEEF;
} }
// This used to crash the analyzer because of the unnamed bitfield.
void PR11249()
{
struct {
char f1:4;
char :4;
char f2[1];
char f3;
} V = { 1, {2}, 3 };
int *p = 0;
if (V.f1 != 1)
*p = 0xDEADBEEF; // no-warning
if (V.f2[0] != 2)
*p = 0xDEADBEEF; // no-warning
if (V.f3 != 3)
*p = 0xDEADBEEF; // no-warning
}