From 0442e962d997bc5022ea7d03785715f6f2041a8d Mon Sep 17 00:00:00 2001 From: Zhongxing Xu Date: Tue, 23 Jun 2009 05:43:16 +0000 Subject: [PATCH] If the init list is fewer than the struct fields, bind the rest fields to 0 explicitly. Make 0 value with the field type. llvm-svn: 73949 --- clang/lib/Analysis/RegionStore.cpp | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/clang/lib/Analysis/RegionStore.cpp b/clang/lib/Analysis/RegionStore.cpp index ff2145e26e0e..0d0f83d71c08 100644 --- a/clang/lib/Analysis/RegionStore.cpp +++ b/clang/lib/Analysis/RegionStore.cpp @@ -1165,20 +1165,14 @@ RegionStoreManager::BindStruct(const GRState *state, const TypedRegion* R, nonloc::CompoundVal& CV = cast(V); nonloc::CompoundVal::iterator VI = CV.begin(), VE = CV.end(); - - for (RecordDecl::field_iterator FI = RD->field_begin(getContext()), - FE = RD->field_end(getContext()); + + RecordDecl::field_iterator FI, FE; + + for (FI = RD->field_begin(getContext()), FE = RD->field_end(getContext()); FI != FE; ++FI, ++VI) { - // There may be fewer values than fields only when we are initializing a - // struct decl. In this case, mark the region as having default value. - if (VI == VE) { - // FIXME: We should bind signed/unsigned 0 according to the sign of the - // field type. - const NonLoc& Idx = NonLoc::MakeIntVal(getBasicVals(), 0, false); - state = state->set(R, Idx); + if (VI == VE) break; - } QualType FTy = (*FI)->getType(); FieldRegion* FR = MRMgr.getFieldRegion(*FI, R); @@ -1191,6 +1185,17 @@ RegionStoreManager::BindStruct(const GRState *state, const TypedRegion* R, state = BindStruct(state, FR, *VI); } + // There may be fewer values in the initialize list than the fields of struct. + while (FI != FE) { + QualType FTy = (*FI)->getType(); + if (FTy->isIntegerType()) { + FieldRegion* FR = MRMgr.getFieldRegion(*FI, R); + state = Bind(state, Loc::MakeVal(FR), ValMgr.makeZeroVal(FTy)); + } + + ++FI; + } + return state; }