From: Chris Lattner Date: Mon, 21 Sep 2009 22:30:50 +0000 (+0000) Subject: move DominatorTree::dominates for instructions out of line, X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=75c7c995b7ed5a5b7527a80d2bbc2b60720b1312;p=oota-llvm.git move DominatorTree::dominates for instructions out of line, no functionality change. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@82490 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h index 846bf1e5f87..e8aceaa6226 100644 --- a/include/llvm/Analysis/Dominators.h +++ b/include/llvm/Analysis/Dominators.h @@ -748,34 +748,13 @@ public: // dominates - Return true if A dominates B. This performs the // special checks necessary if A and B are in the same basic block. - bool dominates(const Instruction *A, const Instruction *B) const { - const BasicBlock *BBA = A->getParent(), *BBB = B->getParent(); - if (BBA != BBB) return dominates(BBA, BBB); + bool dominates(const Instruction *A, const Instruction *B) const; - // It is not possible to determine dominance between two PHI nodes - // based on their ordering. - if (isa(A) && isa(B)) - return false; - - // Loop through the basic block until we find A or B. - BasicBlock::const_iterator I = BBA->begin(); - for (; &*I != A && &*I != B; ++I) /*empty*/; - - //if(!DT.IsPostDominators) { - // A dominates B if it is found first in the basic block. - return &*I == A; - //} else { - // // A post-dominates B if B is found first in the basic block. - // return &*I == B; - //} - } - - inline bool properlyDominates(const DomTreeNode* A, - const DomTreeNode* B) const { + bool properlyDominates(const DomTreeNode *A, const DomTreeNode *B) const { return DT->properlyDominates(A, B); } - inline bool properlyDominates(BasicBlock* A, BasicBlock* B) const { + bool properlyDominates(BasicBlock *A, BasicBlock *B) const { return DT->properlyDominates(A, B); } diff --git a/lib/VMCore/Dominators.cpp b/lib/VMCore/Dominators.cpp index bb73aaf705d..6d0e23d6427 100644 --- a/lib/VMCore/Dominators.cpp +++ b/lib/VMCore/Dominators.cpp @@ -52,6 +52,25 @@ void DominatorTree::print(raw_ostream &OS, const Module *) const { DT->print(OS); } +// dominates - Return true if A dominates B. This performs the +// special checks necessary if A and B are in the same basic block. +bool DominatorTree::dominates(const Instruction *A, const Instruction *B) const{ + const BasicBlock *BBA = A->getParent(), *BBB = B->getParent(); + if (BBA != BBB) return dominates(BBA, BBB); + + // It is not possible to determine dominance between two PHI nodes + // based on their ordering. + if (isa(A) && isa(B)) + return false; + + // Loop through the basic block until we find A or B. + BasicBlock::const_iterator I = BBA->begin(); + for (; &*I != A && &*I != B; ++I) + /*empty*/; + + return &*I == A; +} + //===----------------------------------------------------------------------===//