diff options
Diffstat (limited to 'lib/CodeGen/TailDuplication.cpp')
| -rw-r--r-- | lib/CodeGen/TailDuplication.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/CodeGen/TailDuplication.cpp b/lib/CodeGen/TailDuplication.cpp index 89160709f4..2d89f71bca 100644 --- a/lib/CodeGen/TailDuplication.cpp +++ b/lib/CodeGen/TailDuplication.cpp @@ -669,8 +669,10 @@ TailDuplicatePass::duplicateSimpleBB(MachineBasicBlock *TailBB, PredTBB = NewTarget; // Make the branch unconditional if possible - if (PredTBB == PredFBB) + if (PredTBB == PredFBB) { + PredCond.clear(); PredFBB = NULL; + } // Avoid adding fall through branches. if (PredFBB == NextBB) @@ -684,7 +686,10 @@ TailDuplicatePass::duplicateSimpleBB(MachineBasicBlock *TailBB, TII->InsertBranch(*PredBB, PredTBB, PredFBB, PredCond, DebugLoc()); PredBB->removeSuccessor(TailBB); - PredBB->addSuccessor(NewTarget); + unsigned NumSuccessors = PredBB->succ_size(); + assert(NumSuccessors <= 1); + if (NumSuccessors == 0 || *PredBB->succ_begin() != NewTarget) + PredBB->addSuccessor(NewTarget); TDBBs.push_back(PredBB); @@ -707,7 +712,7 @@ TailDuplicatePass::TailDuplicate(MachineBasicBlock *TailBB, MachineFunction &MF, DenseSet<unsigned> UsedByPhi; getRegsUsedByPHIs(*TailBB, &UsedByPhi); - if (0 && isSimpleBB(TailBB)) // Disabled to see if doing so fixes buildbots. + if (isSimpleBB(TailBB)) return duplicateSimpleBB(TailBB, TDBBs, UsedByPhi, Copies); // Iterate through all the unique predecessors and tail-duplicate this |