aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/VMCore/Dominators.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/VMCore/Dominators.cpp b/lib/VMCore/Dominators.cpp
index 4d125fb022..35b2bbfc22 100644
--- a/lib/VMCore/Dominators.cpp
+++ b/lib/VMCore/Dominators.cpp
@@ -387,12 +387,12 @@ BasicBlock *DominatorTreeBase::findNearestCommonDominator(BasicBlock *A,
DomTreeNode *NodeB = getNode(B);
- // If B immediately dominates A then B is nearest common dominator.
- if (NodeA->getIDom() == NodeB)
+ // If B dominates A then B is nearest common dominator.
+ if (dominates(B,A))
return B;
- // If A immediately dominates B then A is nearest common dominator.
- if (NodeB->getIDom() == NodeA)
+ // If A dominates B then A is nearest common dominator.
+ if (dominates(A,B))
return A;
// Collect NodeA dominators set.
@@ -404,10 +404,6 @@ BasicBlock *DominatorTreeBase::findNearestCommonDominator(BasicBlock *A,
IDomA = IDomA->getIDom();
}
- // If B dominates A then B is nearest common dominator.
- if (NodeADoms.count(NodeB) != 0)
- return B;
-
// Walk NodeB immediate dominators chain and find common dominator node.
DomTreeNode *IDomB = NodeB->getIDom();
while(IDomB) {