RegionStoreManager::RemoveDeadBindings() now removes dead 'default' bindings as well.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@77875 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp
index c95f6c8..32a1dc0 100644
--- a/lib/Analysis/RegionStore.cpp
+++ b/lib/Analysis/RegionStore.cpp
@@ -1763,10 +1763,40 @@
SymReaper.maybeDead(*SI);
}
- // FIXME: remove default bindings as well.
-
+ // Remove dead 'default' bindings.
+ RegionDefaultValue::MapTy NewDVM = DVM;
+ RegionDefaultValue::MapTy::Factory &DVMFactory =
+ state.get_context<RegionDefaultValue>();
+
+ for (RegionDefaultValue::MapTy::iterator I = DVM.begin(), E = DVM.end();
+ I != E; ++I) {
+ const MemRegion *R = I.getKey();
+
+ // If this region live? Is so, none of its symbols are dead.
+ if (Marked.count(R))
+ continue;
+
+ // Remove this dead region.
+ NewDVM = DVMFactory.Remove(NewDVM, R);
+
+ // Mark all non-live symbols that this region references as dead.
+ if (const SymbolicRegion* SymR = dyn_cast<SymbolicRegion>(R))
+ SymReaper.maybeDead(SymR->getSymbol());
+
+ SVal X = I.getData();
+ SVal::symbol_iterator SI = X.symbol_begin(), SE = X.symbol_end();
+ for (; SI != SE; ++SI)
+ SymReaper.maybeDead(*SI);
+ }
+
// Write the store back.
state.setStore(store);
+
+ // Write the updated default bindings back.
+ // FIXME: Right now this involves a fetching of a persistent state.
+ // We can do better.
+ if (DVM != NewDVM)
+ state.setGDM(state.set<RegionDefaultValue>(NewDVM)->getGDM());
}
//===----------------------------------------------------------------------===//