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

Move 'includeGlobals' as a field into ClusterAnalysis. 

llvm-svn: 117335
This commit is contained in:
Ted Kremenek 2010-10-26 00:06:15 +00:00
parent 731310e13e
commit f59449e790
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -456,12 +456,14 @@ protected:
ValueManager &ValMgr;
RegionBindings B;
const bool includeGlobals;
public:
ClusterAnalysis(RegionStoreManager &rm, GRStateManager &StateMgr,
RegionBindings b)
RegionBindings b, const bool includeGlobals)
: RM(rm), Ctx(StateMgr.getContext()), ValMgr(StateMgr.getValueManager()),
B(b) {}
B(b), includeGlobals(includeGlobals) {}
RegionBindings getRegionBindings() const { return B; }
@ -487,7 +489,7 @@ public:
return *CRef;
}
void GenerateClusters(bool includeGlobals = false) {
void GenerateClusters() {
// Scan the entire set of bindings and make the region clusters.
for (RegionBindings::iterator RI = B.begin(), RE = B.end(); RI != RE; ++RI){
RegionCluster &C = AddToCluster(RI.getKey());
@ -574,8 +576,9 @@ public:
RegionBindings b,
const Expr *ex, unsigned count,
StoreManager::InvalidatedSymbols *is,
StoreManager::InvalidatedRegions *r)
: ClusterAnalysis<InvalidateRegionsWorker>(rm, stateMgr, b),
StoreManager::InvalidatedRegions *r,
bool includeGlobals)
: ClusterAnalysis<InvalidateRegionsWorker>(rm, stateMgr, b, includeGlobals),
Ex(ex), Count(count), IS(is), Regions(r) {}
void VisitCluster(const MemRegion *baseR, BindingKey *I, BindingKey *E);
@ -698,10 +701,10 @@ Store RegionStoreManager::InvalidateRegions(Store store,
InvalidatedRegions *Regions) {
InvalidateRegionsWorker W(*this, StateMgr,
RegionStoreManager::GetRegionBindings(store),
Ex, Count, IS, Regions);
Ex, Count, IS, Regions, invalidateGlobals);
// Scan the bindings and generate the clusters.
W.GenerateClusters(invalidateGlobals);
W.GenerateClusters();
// Add I .. E to the worklist.
for ( ; I != E; ++I)
@ -1612,7 +1615,8 @@ public:
RemoveDeadBindingsWorker(RegionStoreManager &rm, GRStateManager &stateMgr,
RegionBindings b, SymbolReaper &symReaper,
const StackFrameContext *LCtx)
: ClusterAnalysis<RemoveDeadBindingsWorker>(rm, stateMgr, b),
: ClusterAnalysis<RemoveDeadBindingsWorker>(rm, stateMgr, b,
/* includeGlobals = */ false),
SymReaper(symReaper), CurrentLCtx(LCtx) {}
// Called by ClusterAnalysis.