[llvm-commits] CVS: llvm/include/llvm/Analysis/PostDominators.h Dominators.h

[Nate Begeman]

Changes in directory llvm/include/llvm/Analysis:

PostDominators.h updated: 1.11 -> 1.12
Dominators.h updated: 1.53 -> 1.54
---
Log message:

Move some common data structures between dom and pdom into the base class


---
Diffs of the changes:  (+16 -32)

 Dominators.h     |   32 ++++++++++++++++----------------
 PostDominators.h |   16 ----------------
 2 files changed, 16 insertions(+), 32 deletions(-)


Index: llvm/include/llvm/Analysis/PostDominators.h
diff -u llvm/include/llvm/Analysis/PostDominators.h:1.11 llvm/include/llvm/Analysis/PostDominators.h:1.12
--- llvm/include/llvm/Analysis/PostDominators.h:1.11	Fri Mar 10 20:20:46 2006
+++ llvm/include/llvm/Analysis/PostDominators.h	Mon Mar 20 13:32:48 2006
@@ -32,22 +32,6 @@
   }
   
 private:
-    struct InfoRec {
-      unsigned Semi;
-      unsigned Size;
-      BasicBlock *Label, *Parent, *Child, *Ancestor;
-      
-      std::vector<BasicBlock*> Bucket;
-      
-      InfoRec() : Semi(0), Size(0), Label(0), Parent(0), Child(0), Ancestor(0){}
-    };
-  
-  // Vertex - Map the DFS number to the BasicBlock*
-  std::vector<BasicBlock*> Vertex;
-  
-  // Info - Collection of information used during the computation of idoms.
-  std::map<BasicBlock*, InfoRec> Info;
-  
   unsigned DFSPass(BasicBlock *V, InfoRec &VInfo, unsigned N);
   void Compress(BasicBlock *V, InfoRec &VInfo);
   BasicBlock *Eval(BasicBlock *v);


Index: llvm/include/llvm/Analysis/Dominators.h
diff -u llvm/include/llvm/Analysis/Dominators.h:1.53 llvm/include/llvm/Analysis/Dominators.h:1.54
--- llvm/include/llvm/Analysis/Dominators.h:1.53	Sat Jan 14 14:55:08 2006
+++ llvm/include/llvm/Analysis/Dominators.h	Mon Mar 20 13:32:48 2006
@@ -66,7 +66,23 @@
 ///
 class ImmediateDominatorsBase : public DominatorBase {
 protected:
+  struct InfoRec {
+    unsigned Semi;
+    unsigned Size;
+    BasicBlock *Label, *Parent, *Child, *Ancestor;
+    
+    std::vector<BasicBlock*> Bucket;
+    
+    InfoRec() : Semi(0), Size(0), Label(0), Parent(0), Child(0), Ancestor(0){}
+  };
+  
   std::map<BasicBlock*, BasicBlock*> IDoms;
+
+  // Vertex - Map the DFS number to the BasicBlock*
+  std::vector<BasicBlock*> Vertex;
+  
+  // Info - Collection of information used during the computation of idoms.
+  std::map<BasicBlock*, InfoRec> Info;
 public:
   ImmediateDominatorsBase(bool isPostDom) : DominatorBase(isPostDom) {}
 
@@ -139,22 +155,6 @@
   }
 
 private:
-  struct InfoRec {
-    unsigned Semi;
-    unsigned Size;
-    BasicBlock *Label, *Parent, *Child, *Ancestor;
-
-    std::vector<BasicBlock*> Bucket;
-
-    InfoRec() : Semi(0), Size(0), Label(0), Parent(0), Child(0), Ancestor(0){}
-  };
-
-  // Vertex - Map the DFS number to the BasicBlock*
-  std::vector<BasicBlock*> Vertex;
-
-  // Info - Collection of information used during the computation of idoms.
-  std::map<BasicBlock*, InfoRec> Info;
-
   unsigned DFSPass(BasicBlock *V, InfoRec &VInfo, unsigned N);
   void Compress(BasicBlock *V, InfoRec &VInfo);
   BasicBlock *Eval(BasicBlock *v);