@@ -332,15 +332,15 @@ static void PlaceBlockMarker(MachineBasicBlock &MBB, MachineFunction &MF,
332
332
return ;
333
333
334
334
assert (&MBB != &MF.front () && " Header blocks shouldn't have predecessors" );
335
- MachineBasicBlock *LayoutPred = &*prev (MachineFunction::iterator (&MBB));
335
+ MachineBasicBlock *LayoutPred = &*std:: prev (MachineFunction::iterator (&MBB));
336
336
337
337
// If the nearest common dominator is inside a more deeply nested context,
338
338
// walk out to the nearest scope which isn't more deeply nested.
339
339
for (MachineFunction::iterator I (LayoutPred), E (Header); I != E; --I) {
340
340
if (MachineBasicBlock *ScopeTop = ScopeTops[I->getNumber ()]) {
341
341
if (ScopeTop->getNumber () > Header->getNumber ()) {
342
342
// Skip over an intervening scope.
343
- I = next (MachineFunction::iterator (ScopeTop));
343
+ I = std:: next (MachineFunction::iterator (ScopeTop));
344
344
} else {
345
345
// We found a scope level at an appropriate depth.
346
346
Header = ScopeTop;
@@ -369,10 +369,11 @@ static void PlaceBlockMarker(MachineBasicBlock &MBB, MachineFunction &MF,
369
369
// Otherwise, insert the BLOCK as late in Header as we can, but before the
370
370
// beginning of the local expression tree and any nested BLOCKs.
371
371
InsertPos = Header->getFirstTerminator ();
372
- while (InsertPos != Header->begin () && IsChild (*prev (InsertPos), MFI) &&
373
- prev (InsertPos)->getOpcode () != WebAssembly::LOOP &&
374
- prev (InsertPos)->getOpcode () != WebAssembly::END_BLOCK &&
375
- prev (InsertPos)->getOpcode () != WebAssembly::END_LOOP)
372
+ while (InsertPos != Header->begin () &&
373
+ IsChild (*std::prev (InsertPos), MFI) &&
374
+ std::prev (InsertPos)->getOpcode () != WebAssembly::LOOP &&
375
+ std::prev (InsertPos)->getOpcode () != WebAssembly::END_BLOCK &&
376
+ std::prev (InsertPos)->getOpcode () != WebAssembly::END_LOOP)
376
377
--InsertPos;
377
378
}
378
379
@@ -406,13 +407,13 @@ static void PlaceLoopMarker(
406
407
// The operand of a LOOP is the first block after the loop. If the loop is the
407
408
// bottom of the function, insert a dummy block at the end.
408
409
MachineBasicBlock *Bottom = LoopBottom (Loop);
409
- auto Iter = next (MachineFunction::iterator (Bottom));
410
+ auto Iter = std:: next (MachineFunction::iterator (Bottom));
410
411
if (Iter == MF.end ()) {
411
412
MachineBasicBlock *Label = MF.CreateMachineBasicBlock ();
412
413
// Give it a fake predecessor so that AsmPrinter prints its label.
413
414
Label->addSuccessor (Label);
414
415
MF.push_back (Label);
415
- Iter = next (MachineFunction::iterator (Bottom));
416
+ Iter = std:: next (MachineFunction::iterator (Bottom));
416
417
}
417
418
MachineBasicBlock *AfterLoop = &*Iter;
418
419
0 commit comments