Fully qualify llvm::next to avoid ambiguity when building as C++11.
llvm-svn: 175608
This commit is contained in:
parent
725fda1213
commit
9db062ebdb
|
@ -440,7 +440,7 @@ void LiveInterval::join(LiveInterval &Other,
|
||||||
|
|
||||||
iterator OutIt = begin();
|
iterator OutIt = begin();
|
||||||
OutIt->valno = NewVNInfo[LHSValNoAssignments[OutIt->valno->id]];
|
OutIt->valno = NewVNInfo[LHSValNoAssignments[OutIt->valno->id]];
|
||||||
for (iterator I = next(OutIt), E = end(); I != E; ++I) {
|
for (iterator I = llvm::next(OutIt), E = end(); I != E; ++I) {
|
||||||
VNInfo* nextValNo = NewVNInfo[LHSValNoAssignments[I->valno->id]];
|
VNInfo* nextValNo = NewVNInfo[LHSValNoAssignments[I->valno->id]];
|
||||||
assert(nextValNo != 0 && "Huh?");
|
assert(nextValNo != 0 && "Huh?");
|
||||||
|
|
||||||
|
|
|
@ -1157,7 +1157,7 @@ tryInstructionTransform(MachineBasicBlock::iterator &mi,
|
||||||
Begin = MachineBasicBlock::iterator(NewMIs[0]);
|
Begin = MachineBasicBlock::iterator(NewMIs[0]);
|
||||||
if (Begin != MBB->begin())
|
if (Begin != MBB->begin())
|
||||||
--Begin;
|
--Begin;
|
||||||
End = next(MachineBasicBlock::iterator(MI));
|
End = llvm::next(MachineBasicBlock::iterator(MI));
|
||||||
|
|
||||||
for (MachineInstr::const_mop_iterator MOI = MI.operands_begin(),
|
for (MachineInstr::const_mop_iterator MOI = MI.operands_begin(),
|
||||||
MOE = MI.operands_end(); MOI != MOE; ++MOI) {
|
MOE = MI.operands_end(); MOI != MOE; ++MOI) {
|
||||||
|
@ -1562,7 +1562,8 @@ eliminateRegSequence(MachineBasicBlock::iterator &MBBI) {
|
||||||
DEBUG(dbgs() << "Inserted: " << *CopyMI);
|
DEBUG(dbgs() << "Inserted: " << *CopyMI);
|
||||||
}
|
}
|
||||||
|
|
||||||
MachineBasicBlock::iterator EndMBBI = next(MachineBasicBlock::iterator(MI));
|
MachineBasicBlock::iterator EndMBBI =
|
||||||
|
llvm::next(MachineBasicBlock::iterator(MI));
|
||||||
|
|
||||||
if (!DefEmitted) {
|
if (!DefEmitted) {
|
||||||
DEBUG(dbgs() << "Turned: " << *MI << " into an IMPLICIT_DEF");
|
DEBUG(dbgs() << "Turned: " << *MI << " into an IMPLICIT_DEF");
|
||||||
|
|
Loading…
Reference in New Issue