diff options
Diffstat (limited to 'lib/Analysis/RegionStore.cpp')
| -rw-r--r-- | lib/Analysis/RegionStore.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp index 02d3d1f885f9..eae3aefe218f 100644 --- a/lib/Analysis/RegionStore.cpp +++ b/lib/Analysis/RegionStore.cpp @@ -651,7 +651,7 @@ SVal RegionStoreManager::EvalBinOp(const GRState *state, // Get symbol's type. It should be a pointer type. SymbolRef Sym = SR->getSymbol(); QualType T = Sym->getType(getContext()); - QualType EleTy = cast<PointerType>(T.getTypePtr())->getPointeeType(); + QualType EleTy = T->getAsPointerType()->getPointeeType(); SVal ZeroIdx = ValMgr.makeZeroArrayIndex(); ER = MRMgr.getElementRegion(EleTy, ZeroIdx, SR); @@ -840,7 +840,7 @@ SVal RegionStoreManager::RetrieveStruct(const GRState* St,const TypedRegion* R){ QualType T = R->getValueType(getContext()); assert(T->isStructureType()); - const RecordType* RT = cast<RecordType>(T.getTypePtr()); + const RecordType* RT = T->getAsStructureType(); RecordDecl* RD = RT->getDecl(); assert(RD->isDefinition()); @@ -1198,6 +1198,11 @@ RegionStoreManager::BindStruct(const GRState* St, const TypedRegion* R, SVal V){ if (V.isUnknown()) return KillStruct(St, R); + // We may get non-CompoundVal accidentally due to imprecise cast logic. Ignore + // them and make struct unknown. + if (!isa<nonloc::CompoundVal>(V)) + return KillStruct(St, R); + nonloc::CompoundVal& CV = cast<nonloc::CompoundVal>(V); nonloc::CompoundVal::iterator VI = CV.begin(), VE = CV.end(); RecordDecl::field_iterator FI = RD->field_begin(getContext()), |