Make DomTree and PostDomTree thin wrappers around DomTreeBase, rather than inheriting from it.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@43259 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson 2007-10-23 20:58:37 +00:00
parent 7bb175b4d1
commit d20cc14dbf
3 changed files with 27 additions and 33 deletions

View File

@ -21,17 +21,39 @@ namespace llvm {
/// PostDominatorTree Class - Concrete subclass of DominatorTree that is used to /// PostDominatorTree Class - Concrete subclass of DominatorTree that is used to
/// compute the a post-dominator tree. /// compute the a post-dominator tree.
/// ///
struct PostDominatorTree : public DominatorTreeBase<BasicBlock> { struct PostDominatorTree : public FunctionPass {
static char ID; // Pass identification, replacement for typeid static char ID; // Pass identification, replacement for typeid
DominatorTreeBase<BasicBlock>* DT;
PostDominatorTree() : PostDominatorTree() : FunctionPass((intptr_t)&ID) {
DominatorTreeBase<BasicBlock>((intptr_t)&ID, true) {} DT = new DominatorTreeBase<BasicBlock>(intptr_t(&ID), true);
}
virtual bool runOnFunction(Function &F); virtual bool runOnFunction(Function &F);
virtual void getAnalysisUsage(AnalysisUsage &AU) const { virtual void getAnalysisUsage(AnalysisUsage &AU) const {
AU.setPreservesAll(); AU.setPreservesAll();
} }
inline const std::vector<BasicBlock*> &getRoots() const {
return DT->getRoots();
}
inline DomTreeNode *getRootNode() const {
return DT->getRootNode();
}
inline DomTreeNode *operator[](BasicBlock *BB) const {
return DT->getNode(BB);
}
inline bool properlyDominates(const DomTreeNode* A, DomTreeNode* B) const {
return DT->properlyDominates(A, B);
}
inline bool properlyDominates(BasicBlock* A, BasicBlock* B) const {
return DT->properlyDominates(A, B);
}
}; };

View File

@ -29,25 +29,7 @@ static RegisterPass<PostDominatorTree>
F("postdomtree", "Post-Dominator Tree Construction", true); F("postdomtree", "Post-Dominator Tree Construction", true);
bool PostDominatorTree::runOnFunction(Function &F) { bool PostDominatorTree::runOnFunction(Function &F) {
reset(); // Reset from the last time we were run... DT->recalculate(F);
// Initialize the roots list
for (Function::iterator I = F.begin(), E = F.end(); I != E; ++I) {
TerminatorInst *Insn = I->getTerminator();
if (Insn->getNumSuccessors() == 0) {
// Unreachable block is not a root node.
if (!isa<UnreachableInst>(Insn))
Roots.push_back(I);
}
// Prepopulate maps so that we don't get iterator invalidation issues later.
IDoms[I] = 0;
DomTreeNodes[I] = 0;
}
Vertex.push_back(0);
Calculate<Inverse<BasicBlock*>, GraphTraits<Inverse<BasicBlock*> > >(*this, F);
return false; return false;
} }

View File

@ -57,17 +57,7 @@ static RegisterPass<DominatorTree>
E("domtree", "Dominator Tree Construction", true); E("domtree", "Dominator Tree Construction", true);
bool DominatorTree::runOnFunction(Function &F) { bool DominatorTree::runOnFunction(Function &F) {
reset(); // Reset from the last time we were run... DT->recalculate(F);
// Initialize roots
Roots.push_back(&F.getEntryBlock());
IDoms[&F.getEntryBlock()] = 0;
DomTreeNodes[&F.getEntryBlock()] = 0;
Vertex.push_back(0);
Calculate<BasicBlock*, GraphTraits<BasicBlock*> >(*this, F);
updateDFSNumbers();
return false; return false;
} }