Hack to work around deficiency in pass infrastructure

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

3 files changed, 15 insertions, 7 deletions

diff --git a/include/llvm/Analysis/DataStructure.h b/include/llvm/Analysis/DataStructure.h
index ddaf83a459..ebcc3c5c64 100644
--- a/include/llvm/Analysis/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure.h
@@ -136,7 +136,7 @@ class TDDataStructures : public Pass {
   hash_set<const Function*> GraphDone;
   DSGraph *GlobalsGraph;
 public:
-  ~TDDataStructures() { releaseMemory(); }
+  ~TDDataStructures() { releaseMyMemory(); }
 
   virtual bool run(Module &M);
 
@@ -157,13 +157,14 @@ public:
   void print(std::ostream &O, const Module *M) const;
 
   // If the pass pipeline is done with this pass, we can release our memory...
-  virtual void releaseMemory();
+  virtual void releaseMyMemory();
 
   // getAnalysisUsage - This obviously provides a data structure graph.
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
     AU.addRequired<BUDataStructures>();
   }
+
 private:
   void calculateGraph(Function &F);
   DSGraph &getOrCreateDSGraph(Function &F);
diff --git a/include/llvm/Analysis/DataStructure/DataStructure.h b/include/llvm/Analysis/DataStructure/DataStructure.h
index ddaf83a459..ebcc3c5c64 100644
--- a/include/llvm/Analysis/DataStructure/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure/DataStructure.h
@@ -136,7 +136,7 @@ class TDDataStructures : public Pass {
   hash_set<const Function*> GraphDone;
   DSGraph *GlobalsGraph;
 public:
-  ~TDDataStructures() { releaseMemory(); }
+  ~TDDataStructures() { releaseMyMemory(); }
 
   virtual bool run(Module &M);
 
@@ -157,13 +157,14 @@ public:
   void print(std::ostream &O, const Module *M) const;
 
   // If the pass pipeline is done with this pass, we can release our memory...
-  virtual void releaseMemory();
+  virtual void releaseMyMemory();
 
   // getAnalysisUsage - This obviously provides a data structure graph.
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
     AU.addRequired<BUDataStructures>();
   }
+
 private:
   void calculateGraph(Function &F);
   DSGraph &getOrCreateDSGraph(Function &F);
diff --git a/lib/Analysis/DataStructure/TopDownClosure.cpp b/lib/Analysis/DataStructure/TopDownClosure.cpp
index 367f6a1d27..49b3a5482e 100644
--- a/lib/Analysis/DataStructure/TopDownClosure.cpp
+++ b/lib/Analysis/DataStructure/TopDownClosure.cpp
@@ -13,8 +13,10 @@
 #include "llvm/DerivedTypes.h"
 #include "Support/Statistic.h"
 
-static RegisterAnalysis<TDDataStructures>
-Y("tddatastructure", "Top-down Data Structure Analysis Closure");
+namespace {
+  RegisterAnalysis<TDDataStructures>   // Register the pass
+  Y("tddatastructure", "Top-down Data Structure Analysis Closure");
+}
 
 // run - Calculate the top down data structure graphs for each function in the
 // program.
@@ -39,7 +41,10 @@ bool TDDataStructures::run(Module &M) {
 // releaseMemory - If the pass pipeline is done with this pass, we can release
 // our memory... here...
 //
-void TDDataStructures::releaseMemory() {
+// FIXME: This should be releaseMemory and will work fine, except that LoadVN
+// has no way to extend the lifetime of the pass, which screws up ds-aa.
+//
+void TDDataStructures::releaseMyMemory() {
   for (hash_map<const Function*, DSGraph*>::iterator I = DSInfo.begin(),
          E = DSInfo.end(); I != E; ++I)
     delete I->second;
@@ -206,3 +211,4 @@ void TDDataStructures::calculateGraph(Function &F) {
       calculateGraph(*I->first);
     }
 }
+