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

Hack: have BasicStore::getLValueElement return the "Base" lvalue. This restores null dereference checking with array accesses. 

BasicStore::RemoveDeadBindings: handle regions besides VarRegions (we now have FieldRegions).

llvm-svn: 57741
This commit is contained in:
Ted Kremenek 2008-10-17 22:52:40 +00:00
parent 213873232d
commit db5ae0aa1c
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
clang/lib/Analysis/BasicStore.cpp
View File

@ -129,7 +129,8 @@ SVal BasicStoreManager::getLValueField(const GRState* St, const FieldDecl* D,
SVal BasicStoreManager::getLValueElement(const GRState* St, SVal Base, SVal BasicStoreManager::getLValueElement(const GRState* St, SVal Base,
SVal Offset) { SVal Offset) {
return UnknownVal(); // Total hack: Just return "Base" for now.
return Base;
} }
SVal BasicStoreManager::GetSVal(Store St, Loc LV, QualType T) { SVal BasicStoreManager::GetSVal(Store St, Loc LV, QualType T) {
@ -237,25 +238,37 @@ BasicStoreManager::RemoveDeadBindings(Store store, Stmt* Loc,
llvm::SmallPtrSet<const VarRegion*, 10> Marked; llvm::SmallPtrSet<const VarRegion*, 10> Marked;
while (!RegionRoots.empty()) { while (!RegionRoots.empty()) {
const VarRegion* R = cast<VarRegion>(RegionRoots.back()); const MemRegion* MR = RegionRoots.back();
RegionRoots.pop_back(); RegionRoots.pop_back();
if (Marked.count(R)) while (MR) {
continue; if (const SymbolicRegion* SymR = dyn_cast<SymbolicRegion>(MR)) {
LSymbols.insert(SymR->getSymbol());
break;
}
else if (const VarRegion* R = dyn_cast<VarRegion>(MR)) {
if (Marked.count(R))
break;
Marked.insert(R);
SVal X = GetRegionSVal(store, R);
Marked.insert(R); // FIXME: We need to handle symbols nested in region definitions.
// FIXME: Do we need the QualType here, since regions are partially for (symbol_iterator SI=X.symbol_begin(), SE=X.symbol_end(); SI!=SE; ++SI)
// typed? LSymbols.insert(*SI);
SVal X = GetSVal(store, loc::MemRegionVal(R), QualType());
for (symbol_iterator SI=X.symbol_begin(), SE=X.symbol_end(); SI!=SE; ++SI) if (!isa<loc::MemRegionVal>(X))
LSymbols.insert(*SI); break;
if (!isa<loc::MemRegionVal>(X)) const loc::MemRegionVal& LVD = cast<loc::MemRegionVal>(X);
continue; RegionRoots.push_back(LVD.getRegion());
break;
const loc::MemRegionVal& LVD = cast<loc::MemRegionVal>(X); }
RegionRoots.push_back(cast<VarRegion>(LVD.getRegion())); else if (const SubRegion* R = dyn_cast<SubRegion>(MR))
MR = R->getSuperRegion();
else
break;
}
} }
// Remove dead variable bindings. // Remove dead variable bindings.