replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More GRState* -> Store changes. 

llvm-svn: 95365
This commit is contained in:
Zhongxing Xu 2010-02-05 05:34:29 +00:00
parent 0d081f373a
commit ad0ef84040
5 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/include/clang/Checker/PathSensitive/Store.h
View File

@ -132,8 +132,8 @@ public:
return UnknownVal();
}
virtual void RemoveDeadBindings(GRState &state, Stmt* Loc,
SymbolReaper& SymReaper,
virtual Store RemoveDeadBindings(Store store, Stmt* Loc,
SymbolReaper& SymReaper,
llvm::SmallVectorImpl<const MemRegion*>& RegionRoots) = 0;
virtual Store BindDecl(Store store, const VarRegion *VR, SVal initVal) = 0;

13
clang/lib/Checker/BasicStore.cpp
View File

@ -82,7 +82,7 @@ public:
/// RemoveDeadBindings - Scans a BasicStore of 'state' for dead values.
/// It updatees the GRState object in place with the values removed.
void RemoveDeadBindings(GRState &state, Stmt* Loc, SymbolReaper& SymReaper,
Store RemoveDeadBindings(Store store, Stmt* Loc, SymbolReaper& SymReaper,
llvm::SmallVectorImpl<const MemRegion*>& RegionRoots);
void iterBindings(Store store, BindingsHandler& f);
@ -343,12 +343,10 @@ Store BasicStoreManager::Remove(Store store, Loc loc) {
}
}
void
BasicStoreManager::RemoveDeadBindings(GRState &state, Stmt* Loc,
SymbolReaper& SymReaper,
Store BasicStoreManager::RemoveDeadBindings(Store store, Stmt* Loc,
SymbolReaper& SymReaper,
llvm::SmallVectorImpl<const MemRegion*>& RegionRoots)
{
Store store = state.getStore();
BindingsTy B = GetBindings(store);
typedef SVal::symbol_iterator symbol_iterator;
@ -389,7 +387,7 @@ BasicStoreManager::RemoveDeadBindings(GRState &state, Stmt* Loc,
break;
Marked.insert(MR);
SVal X = Retrieve(state.getStore(), loc::MemRegionVal(MR));
SVal X = Retrieve(store, loc::MemRegionVal(MR));
// FIXME: We need to handle symbols nested in region definitions.
for (symbol_iterator SI=X.symbol_begin(),SE=X.symbol_end();SI!=SE;++SI)
@ -422,8 +420,7 @@ BasicStoreManager::RemoveDeadBindings(GRState &state, Stmt* Loc,
}
}
// Write the store back.
state.setStore(store);
return store;
}
Store BasicStoreManager::scanForIvars(Stmt *B, const Decl* SelfDecl,

12
clang/lib/Checker/FlatStore.cpp
View File

@ -48,9 +48,10 @@ public:
SVal getLValueField(const FieldDecl* D, SVal Base);
SVal getLValueElement(QualType elementType, SVal offset, SVal Base);
SVal ArrayToPointer(Loc Array);
void RemoveDeadBindings(GRState &state, Stmt* Loc,
SymbolReaper& SymReaper,
llvm::SmallVectorImpl<const MemRegion*>& RegionRoots);
Store RemoveDeadBindings(Store store, Stmt* Loc, SymbolReaper& SymReaper,
llvm::SmallVectorImpl<const MemRegion*>& RegionRoots){
return store;
}
Store BindDecl(Store store, const VarRegion *VR, SVal initVal);
@ -116,11 +117,6 @@ SVal FlatStoreManager::ArrayToPointer(Loc Array) {
return Array;
}
void FlatStoreManager::RemoveDeadBindings(GRState &state, Stmt* Loc,
SymbolReaper& SymReaper,
llvm::SmallVectorImpl<const MemRegion*>& RegionRoots) {
}
Store FlatStoreManager::BindDecl(Store store, const VarRegion *VR,
SVal initVal) {
return store;

3
clang/lib/Checker/GRState.cpp
View File

@ -50,7 +50,8 @@ GRStateManager::RemoveDeadBindings(const GRState* state, Stmt* Loc,
state, RegionRoots);
// Clean up the store.
StoreMgr->RemoveDeadBindings(NewState, Loc, SymReaper, RegionRoots);
NewState.St = StoreMgr->RemoveDeadBindings(NewState.St, Loc, SymReaper,
RegionRoots);
return ConstraintMgr->RemoveDeadBindings(getPersistentState(NewState),
SymReaper);

10
clang/lib/Checker/RegionStore.cpp
View File

@ -389,7 +389,7 @@ public: // Part of public interface to class.
/// RemoveDeadBindings - Scans the RegionStore of 'state' for dead values.
/// It returns a new Store with these values removed.
void RemoveDeadBindings(GRState &state, Stmt* Loc, SymbolReaper& SymReaper,
Store RemoveDeadBindings(Store store, Stmt* Loc, SymbolReaper& SymReaper,
llvm::SmallVectorImpl<const MemRegion*>& RegionRoots);
const GRState *EnterStackFrame(const GRState *state,
@ -1789,13 +1789,12 @@ Store RegionStoreManager::Remove(Store store, BindingKey K) {
// State pruning.
//===----------------------------------------------------------------------===//
void RegionStoreManager::RemoveDeadBindings(GRState &state, Stmt* Loc,
SymbolReaper& SymReaper,
Store RegionStoreManager::RemoveDeadBindings(Store store, Stmt* Loc,
SymbolReaper& SymReaper,
llvm::SmallVectorImpl<const MemRegion*>& RegionRoots)
{
typedef std::pair<Store, const MemRegion *> RBDNode;
Store store = state.getStore();
RegionBindings B = GetRegionBindings(store);
// The backmap from regions to subregions.
@ -1985,8 +1984,7 @@ tryAgain:
SymReaper.maybeDead(*SI);
}
// Write the store back.
state.setStore(new_store);
return new_store;
}
GRState const *RegionStoreManager::EnterStackFrame(GRState const *state,