mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-21 18:29:46 +00:00
Make post-ra tail duplication bundle safe. No test case as recent codegen
flow changes have already hidden the bug. rdar://10893812 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@150949 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
7fa7677705
commit
df7e8bd702
@ -433,7 +433,7 @@ void TailDuplicatePass::DuplicateInstruction(MachineInstr *MI,
|
||||
MO.setReg(VI->second);
|
||||
}
|
||||
}
|
||||
PredBB->insert(PredBB->end(), NewMI);
|
||||
PredBB->insert(PredBB->instr_end(), NewMI);
|
||||
}
|
||||
|
||||
/// UpdateSuccessorsPHIs - After FromBB is tail duplicated into its predecessor
|
||||
@ -778,8 +778,10 @@ TailDuplicatePass::TailDuplicate(MachineBasicBlock *TailBB,
|
||||
// Clone the contents of TailBB into PredBB.
|
||||
DenseMap<unsigned, unsigned> LocalVRMap;
|
||||
SmallVector<std::pair<unsigned,unsigned>, 4> CopyInfos;
|
||||
MachineBasicBlock::iterator I = TailBB->begin();
|
||||
while (I != TailBB->end()) {
|
||||
// Use instr_iterator here to properly handle bundles, e.g.
|
||||
// ARM Thumb2 IT block.
|
||||
MachineBasicBlock::instr_iterator I = TailBB->instr_begin();
|
||||
while (I != TailBB->instr_end()) {
|
||||
MachineInstr *MI = &*I;
|
||||
++I;
|
||||
if (MI->isPHI()) {
|
||||
@ -849,6 +851,7 @@ TailDuplicatePass::TailDuplicate(MachineBasicBlock *TailBB,
|
||||
// Replace def of virtual registers with new registers, and update
|
||||
// uses with PHI source register or the new registers.
|
||||
MachineInstr *MI = &*I++;
|
||||
assert(!MI->isBundle() && "Not expecting bundles before regalloc!");
|
||||
DuplicateInstruction(MI, TailBB, PrevBB, MF, LocalVRMap, UsedByPhi);
|
||||
MI->eraseFromParent();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user