mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2026-04-26 12:20:42 +00:00
improve portability to avoid conflicting with std::next in c++'0x.
Patch by Howard Hinnant! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@90365 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -301,8 +301,8 @@ void llvm::PHIElimination::LowerAtomicPHINode(
|
||||
|
||||
// Check that no other terminators use values.
|
||||
#ifndef NDEBUG
|
||||
for (MachineBasicBlock::iterator TI = next(Term); TI != opBlock.end();
|
||||
++TI) {
|
||||
for (MachineBasicBlock::iterator TI = llvm::next(Term);
|
||||
TI != opBlock.end(); ++TI) {
|
||||
assert(!TI->readsRegister(SrcReg) &&
|
||||
"Terminator instructions cannot use virtual registers unless"
|
||||
"they are the first terminator in a block!");
|
||||
@@ -377,7 +377,7 @@ MachineBasicBlock *PHIElimination::SplitCriticalEdge(MachineBasicBlock *A,
|
||||
++NumSplits;
|
||||
|
||||
MachineBasicBlock *NMBB = MF->CreateMachineBasicBlock();
|
||||
MF->insert(next(MachineFunction::iterator(A)), NMBB);
|
||||
MF->insert(llvm::next(MachineFunction::iterator(A)), NMBB);
|
||||
DEBUG(errs() << "PHIElimination splitting critical edge:"
|
||||
" BB#" << A->getNumber()
|
||||
<< " -- BB#" << NMBB->getNumber()
|
||||
|
||||
Reference in New Issue
Block a user