From: Dan Gohman Date: Fri, 30 Oct 2009 22:22:22 +0000 (+0000) Subject: Sort the incoming values in PHI nodes to match the predecessor order. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8e42e4baaea4c9252eba39a4bcf4f295ebd8c78a;p=oota-llvm.git Sort the incoming values in PHI nodes to match the predecessor order. This helps expose duplicate PHIs, which will make it easier for them to be eliminated. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@85623 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp index 0ca3114c44d..e1741a00676 100644 --- a/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/lib/Transforms/Scalar/InstructionCombining.cpp @@ -10980,6 +10980,25 @@ Instruction *InstCombiner::visitPHINode(PHINode &PN) { } } } + + // Sort the PHI node operands to match the pred iterator order. This will + // help identical PHIs be eliminated by other passes. Other passes shouldn't + // depend on this for correctness however. + unsigned i = 0; + for (pred_iterator PI = pred_begin(PN.getParent()), + PE = pred_end(PN.getParent()); PI != PE; ++PI, ++i) + if (PN.getIncomingBlock(i) != *PI) { + unsigned j = PN.getBasicBlockIndex(*PI); + Value *VA = PN.getIncomingValue(i); + BasicBlock *BBA = PN.getIncomingBlock(i); + Value *VB = PN.getIncomingValue(j); + BasicBlock *BBB = PN.getIncomingBlock(j); + PN.setIncomingBlock(i, BBB); + PN.setIncomingValue(i, VB); + PN.setIncomingBlock(j, BBA); + PN.setIncomingValue(j, VA); + } + return 0; }