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

Revert r71744. I must not have understood this correctly, because the

Browse Source 
assertion is failing for some tests.

llvm-svn: 71779
This commit is contained in:
Bob Wilson 2009-05-14 18:08:41 +00:00
parent e740d81911
commit 6571391191
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/CodeGen/IfConversion.cpp
View File

@ -1187,10 +1187,15 @@ void IfConverter::MergeBlocks(BBInfo &ToBBI, BBInfo &FromBBI) {
ToBBI.BB->splice(ToBBI.BB->end(),
FromBBI.BB, FromBBI.BB->begin(), FromBBI.BB->end());
// This only works when FromBBI has no predecessors except ToBBI.
assert(FromBBI.BB->pred_size() == 1 &&
*FromBBI.BB->pred_begin() == ToBBI.BB &&
"if-converter not merging block into its unique predecessor");
// Redirect all branches to FromBB to ToBB.
std::vector<MachineBasicBlock *> Preds(FromBBI.BB->pred_begin(),
FromBBI.BB->pred_end());
for (unsigned i = 0, e = Preds.size(); i != e; ++i) {
MachineBasicBlock *Pred = Preds[i];
if (Pred == ToBBI.BB)
continue;
Pred->ReplaceUsesOfBlockWith(FromBBI.BB, ToBBI.BB);
}
std::vector<MachineBasicBlock *> Succs(FromBBI.BB->succ_begin(),
FromBBI.BB->succ_end());