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

MipsLongBranch.cpp: Tweak llvm::next() to appease msvc.

Browse Source 
llvm-svn: 158446
This commit is contained in:
NAKAMURA Takumi 2012-06-14 12:29:48 +00:00
parent 2a7d06a53e
commit cf2652ae8c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Target/Mips/MipsLongBranch.cpp
View File

@ -129,7 +129,7 @@ void MipsLongBranch::splitMBB(MachineBasicBlock *MBB) {
(!LastBr->isConditionalBranch() && !LastBr->isUnconditionalBranch()))
return;
ReverseIter FirstBr = getNonDebugInstr(next(LastBr), End);
ReverseIter FirstBr = getNonDebugInstr(llvm::next(LastBr), End);
// MBB has only one branch instruction if FirstBr is not a branch
// instruction.
@ -149,7 +149,7 @@ void MipsLongBranch::splitMBB(MachineBasicBlock *MBB) {
NewMBB->removeSuccessor(Tgt);
MBB->addSuccessor(NewMBB);
MBB->addSuccessor(Tgt);
MF->insert(next(MachineFunction::iterator(MBB)), NewMBB);
MF->insert(llvm::next(MachineFunction::iterator(MBB)), NewMBB);
NewMBB->splice(NewMBB->end(), MBB, (++LastBr).base(), MBB->end());
}
@ -319,10 +319,12 @@ void MipsLongBranch::expandToLongBranch(MBBInfo &I) {
// addiu $at, $at, %lo($tgt)
// jr $at
// nop
I.Size += (addLongBranch(*MBB, next(Iter(I.Br)), Tgt, DL, true) - 1) * 4;
I.Size += (addLongBranch(*MBB, llvm::next(Iter(I.Br)), Tgt, DL, true)
- 1) * 4;
// Remove branch and clear InsideBundle bit of the next instruction.
next(MachineBasicBlock::instr_iterator(I.Br))->setIsInsideBundle(false);
llvm::next(MachineBasicBlock::instr_iterator(I.Br))
->setIsInsideBundle(false);
I.Br->eraseFromParent();
return;
}
@ -346,7 +348,7 @@ void MipsLongBranch::expandToLongBranch(MBBInfo &I) {
// FallThrough:
MachineBasicBlock *NewMBB = MF->CreateMachineBasicBlock(MBB->getBasicBlock());
MF->insert(next(MachineFunction::iterator(MBB)), NewMBB);
MF->insert(llvm::next(MachineFunction::iterator(MBB)), NewMBB);
MBB->removeSuccessor(Tgt);
MBB->addSuccessor(NewMBB);
NewMBB->addSuccessor(Tgt);