a hack to allow count-aa to work with ds-aa :(

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@20791 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 5 insertions, 6 deletions

diff --git a/include/llvm/Analysis/DataStructure/DataStructure.h b/include/llvm/Analysis/DataStructure/DataStructure.h
index a12467eb99..d2331e1bbd 100644
--- a/include/llvm/Analysis/DataStructure/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure/DataStructure.h
@@ -112,7 +112,7 @@ protected:
   /// with other global values in the DSGraphs.
   EquivalenceClasses<GlobalValue*> GlobalECs;
 public:
-  ~BUDataStructures() { releaseMemory(); }
+  ~BUDataStructures() { releaseMyMemory(); }
 
   virtual bool runOnModule(Module &M);
 
@@ -143,10 +143,9 @@ public:
   ///
   void print(std::ostream &O, const Module *M) const;
 
-  /// releaseMemory - if the pass pipeline is done with this pass, we can
-  /// release our memory...
-  ///
-  virtual void releaseMemory();
+  // FIXME: Once the pass manager is straightened out, rename this to
+  // releaseMemory.
+  void releaseMyMemory();
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
diff --git a/lib/Analysis/DataStructure/BottomUpClosure.cpp b/lib/Analysis/DataStructure/BottomUpClosure.cpp
index 47ffc87cc7..640463db30 100644
--- a/lib/Analysis/DataStructure/BottomUpClosure.cpp
+++ b/lib/Analysis/DataStructure/BottomUpClosure.cpp
@@ -305,7 +305,7 @@ unsigned BUDataStructures::calculateGraphs(Function *F,
 // releaseMemory - If the pass pipeline is done with this pass, we can release
 // our memory... here...
 //
-void BUDataStructures::releaseMemory() {
+void BUDataStructures::releaseMyMemory() {
   for (hash_map<Function*, DSGraph*>::iterator I = DSInfo.begin(),
          E = DSInfo.end(); I != E; ++I) {
     I->second->getReturnNodes().erase(I->first);