Refactor MemRegionManager instance variable into parent class. No functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@61888 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/BasicStore.cpp b/lib/Analysis/BasicStore.cpp
index fe14a9e..9e469c0 100644
--- a/lib/Analysis/BasicStore.cpp
+++ b/lib/Analysis/BasicStore.cpp
@@ -26,14 +26,13 @@
class VISIBILITY_HIDDEN BasicStoreManager : public StoreManager {
VarBindingsTy::Factory VBFactory;
GRStateManager& StateMgr;
- MemRegionManager MRMgr;
const MemRegion* SelfRegion;
public:
BasicStoreManager(GRStateManager& mgr)
- : VBFactory(mgr.getAllocator()),
+ : StoreManager(mgr.getAllocator()),
+ VBFactory(mgr.getAllocator()),
StateMgr(mgr),
- MRMgr(StateMgr.getAllocator()),
SelfRegion(0) {}
~BasicStoreManager() {}
@@ -49,7 +48,6 @@
Store BindInternal(Store St, Loc LV, SVal V);
Store Remove(Store St, Loc LV);
Store getInitialStore();
- MemRegionManager& getRegionManager() { return MRMgr; }
// FIXME: Investigate what is using this. This method should be removed.
virtual Loc getLoc(const VarDecl* VD) {
diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp
index 4e0215b..598107c 100644
--- a/lib/Analysis/RegionStore.cpp
+++ b/lib/Analysis/RegionStore.cpp
@@ -54,6 +54,7 @@
//
// MemRegions represent chunks of memory with a size (their "extent"). This
// GDM entry tracks the extents for regions. Extents are in bytes.
+//
namespace { class VISIBILITY_HIDDEN RegionExtents {}; }
static int RegionExtentsIndex = 0;
namespace clang {
@@ -108,14 +109,13 @@
RegionViews::Factory RVFactory;
GRStateManager& StateMgr;
- MemRegionManager MRMgr;
public:
RegionStoreManager(GRStateManager& mgr)
- : RBFactory(mgr.getAllocator()),
+ : StoreManager(mgr.getAllocator()),
+ RBFactory(mgr.getAllocator()),
RVFactory(mgr.getAllocator()),
- StateMgr(mgr),
- MRMgr(StateMgr.getAllocator()) {}
+ StateMgr(mgr) {}
virtual ~RegionStoreManager() {}