From 850c9178dc5bc8a49fc41c7cf606bfdd7cd1de3a Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 21 Sep 2009 22:39:35 +0000 Subject: Fix PR5023: The instruction form of DominatorTree::dominates did not take into consideration that the result of an invoke is only valid in the normal dest, not the unwind dest. This caused 'PHINode::hasConstantValue' to return true in an invalid situation, causing mem2reg to delete a phi that was actually needed. This caused a crash building 483.xalancbmk. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@82491 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/VMCore/Dominators.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib/VMCore/Dominators.cpp') diff --git a/lib/VMCore/Dominators.cpp b/lib/VMCore/Dominators.cpp index 6d0e23d642..1f172145c3 100644 --- a/lib/VMCore/Dominators.cpp +++ b/lib/VMCore/Dominators.cpp @@ -52,10 +52,16 @@ void DominatorTree::print(raw_ostream &OS, const Module *) const { DT->print(OS); } -// dominates - Return true if A dominates B. This performs the +// dominates - Return true if A dominates a use in 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 A is an invoke instruction, its value is only available in this normal + // successor block. + if (const InvokeInst *II = dyn_cast(A)) + BBA = II->getNormalDest(); + if (BBA != BBB) return dominates(BBA, BBB); // It is not possible to determine dominance between two PHI nodes -- cgit v1.2.3