RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-25 20:23:11 +01:00
Code Issues Projects Releases Wiki Activity

Reapply r85634, with the bug fixed.

Browse Source 
llvm-svn: 85655
This commit is contained in:
Dan Gohman 2009-10-31 14:22:52 +00:00
parent 02e34cd465
commit 25091aa227
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/Transforms/Scalar/InstructionCombining.cpp
View File

@ -10981,22 +10981,24 @@ 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);
// If there are multiple PHIs, sort their operands so that they all list
// the blocks in the same order. This will help identical PHIs be eliminated
// by other passes. Other passes shouldn't depend on this for correctness
// however.
PHINode *FirstPN = cast<PHINode>(PN.getParent()->begin());
if (&PN != FirstPN)
for (unsigned i = 0, e = FirstPN->getNumIncomingValues(); i != e; ++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);
BasicBlock *BBB = FirstPN->getIncomingBlock(i);
if (BBA != BBB) {
Value *VA = PN.getIncomingValue(i);
unsigned j = PN.getBasicBlockIndex(BBB);
Value *VB = PN.getIncomingValue(j);
PN.setIncomingBlock(i, BBB);
PN.setIncomingValue(i, VB);
PN.setIncomingBlock(j, BBA);
PN.setIncomingValue(j, VA);
}
}
return 0;