Try to fix buildbots

[oota-llvm.git] / lib / CodeGen / MachineBasicBlock.cpp

diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp
index 9d81ee6f339e2b1c03402b66b46a1a281a0a33fa..9ff4858f0a4e0a574a1acdf93d07af81c54d5801 100644 (file)
--- a/lib/CodeGen/MachineBasicBlock.cpp
+++ b/lib/CodeGen/MachineBasicBlock.cpp
@@ -278,8 +278,9 @@ void MachineBasicBlock::print(raw_ostream &OS, ModuleSlotTracker &MST,
   if (!livein_empty()) {
     if (Indexes) OS << '\t';
     OS << "    Live Ins:";
   if (!livein_empty()) {
     if (Indexes) OS << '\t';
     OS << "    Live Ins:";

-    for (livein_iterator I = livein_begin(),E = livein_end(); I != E; ++I)
-      OS << ' ' << PrintReg(*I, TRI);
+    for (unsigned LI : make_range(livein_begin(), livein_end())) {
+      OS << ' ' << PrintReg(LI, TRI);
+    }

     OS << '\n';
   }
   // Print the preds of this block according to the CFG.
     OS << '\n';
   }
   // Print the preds of this block according to the CFG.


@@ -322,8 +323,8 @@ void MachineBasicBlock::printAsOperand(raw_ostream &OS,
 }
 
 void MachineBasicBlock::removeLiveIn(unsigned Reg) {
 }
 
 void MachineBasicBlock::removeLiveIn(unsigned Reg) {

-  std::vector<unsigned>::iterator I =
-    std::find(LiveIns.begin(), LiveIns.end(), Reg);
+  std::vector<unsigned>::iterator I
+    = std::find(LiveIns.begin(), LiveIns.end(), Reg);

   if (I != LiveIns.end())
     LiveIns.erase(I);
 }
   if (I != LiveIns.end())
     LiveIns.erase(I);
 }


@@ -804,9 +805,8 @@ MachineBasicBlock::SplitCriticalEdge(MachineBasicBlock *Succ, Pass *P) {
         i->getOperand(ni+1).setMBB(NMBB);
 
   // Inherit live-ins from the successor
         i->getOperand(ni+1).setMBB(NMBB);
 
   // Inherit live-ins from the successor

-  for (MachineBasicBlock::livein_iterator I = Succ->livein_begin(),
-         E = Succ->livein_end(); I != E; ++I)
-    NMBB->addLiveIn(*I);
+  for (unsigned LI : Succ->liveins())
+    NMBB->addLiveIn(LI);

 
   // Update LiveVariables.
   const TargetRegisterInfo *TRI = MF->getSubtarget().getRegisterInfo();
 
   // Update LiveVariables.
   const TargetRegisterInfo *TRI = MF->getSubtarget().getRegisterInfo();