Subzero: Use range-based for loops with llvm::ilist<Inst> lists.

src/IceCfg.cpp

 //===- subzero/src/IceCfg.cpp - Control flow graph implementation ---------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the Cfg class, including constant pool
@@ skipping 276 matching lines @@
     // Reset each variable's live range.
     for (Variable *Var : Variables)
       Var->resetLiveRange();
   }
   // Make a final pass over each node to delete dead instructions,
   // collect the first and last instruction numbers, and add live
   // range segments for that node.
   for (CfgNode *Node : Nodes) {
     InstNumberT FirstInstNum = Inst::NumberSentinel;
     InstNumberT LastInstNum = Inst::NumberSentinel;
-    for (auto I = Node->getPhis().begin(), E = Node->getPhis().end(); I != E;
-         ++I) {
-      I->deleteIfDead();
-      if (Mode == Liveness_Intervals && !I->isDeleted()) {
+    for (Inst &I : Node->getPhis()) {
+      I.deleteIfDead();
+      if (Mode == Liveness_Intervals && !I.isDeleted()) {
         if (FirstInstNum == Inst::NumberSentinel)
-          FirstInstNum = I->getNumber();
-        assert(I->getNumber() > LastInstNum);
-        LastInstNum = I->getNumber();
+          FirstInstNum = I.getNumber();
+        assert(I.getNumber() > LastInstNum);
+        LastInstNum = I.getNumber();
       }
     }
-    for (auto I = Node->getInsts().begin(), E = Node->getInsts().end(); I != E;
-         ++I) {
-      I->deleteIfDead();
-      if (Mode == Liveness_Intervals && !I->isDeleted()) {
+    for (Inst &I : Node->getInsts()) {
+      I.deleteIfDead();
+      if (Mode == Liveness_Intervals && !I.isDeleted()) {
         if (FirstInstNum == Inst::NumberSentinel)
-          FirstInstNum = I->getNumber();
-        assert(I->getNumber() > LastInstNum);
-        LastInstNum = I->getNumber();
+          FirstInstNum = I.getNumber();
+        assert(I.getNumber() > LastInstNum);
+        LastInstNum = I.getNumber();
       }
     }
     if (Mode == Liveness_Intervals) {
       // Special treatment for live in-args.  Their liveness needs to
       // extend beyond the beginning of the function, otherwise an arg
       // whose only use is in the first instruction will end up having
       // the trivial live range [2,2) and will *not* interfere with
       // other arguments.  So if the first instruction of the method
       // is "r=arg1+arg2", both args may be assigned the same
       // register.  This is accomplished by extending the entry
       // block's instruction range from [2,n) to [1,n) which will
       // transform the problematic [2,2) live ranges into [1,2).
       if (FirstInstNum == Inst::NumberInitial)
         FirstInstNum = Inst::NumberExtended;
       Node->livenessAddIntervals(getLiveness(), FirstInstNum, LastInstNum);
     }
   }
 }
 
 // Traverse every Variable of every Inst and verify that it
 // appears within the Variable's computed live range.
 bool Cfg::validateLiveness() const {
   TimerMarker T(TimerStack::TT_validateLiveness, this);
   bool Valid = true;
   Ostream &Str = Ctx->getStrDump();
   for (CfgNode *Node : Nodes) {
     Inst *FirstInst = nullptr;
-    for (auto Inst = Node->getInsts().begin(), E = Node->getInsts().end();
-         Inst != E; ++Inst) {
-      if (Inst->isDeleted())
+    for (Inst &Inst : Node->getInsts()) {
+      if (Inst.isDeleted())
         continue;
       if (FirstInst == nullptr)
-        FirstInst = Inst;
-      InstNumberT InstNumber = Inst->getNumber();
-      if (Variable *Dest = Inst->getDest()) {
+        FirstInst = &Inst;
+      InstNumberT InstNumber = Inst.getNumber();
+      if (Variable *Dest = Inst.getDest()) {
         if (!Dest->getIgnoreLiveness()) {
           bool Invalid = false;
           const bool IsDest = true;
           if (!Dest->getLiveRange().containsValue(InstNumber, IsDest))
             Invalid = true;
           // Check that this instruction actually *begins* Dest's live
           // range, by checking that Dest is not live in the previous
           // instruction.  As a special exception, we don't check this
           // for the first instruction of the block, because a Phi
           // temporary may be live at the end of the previous block,
           // and if it is also assigned in the first instruction of
           // this block, the adjacent live ranges get merged.
-          if (static_cast<class Inst *>(Inst) != FirstInst &&
-              !Inst->isDestNonKillable() &&
+          if (static_cast<class Inst *>(&Inst) != FirstInst &&
+              !Inst.isDestNonKillable() &&
               Dest->getLiveRange().containsValue(InstNumber - 1, IsDest))
             Invalid = true;
           if (Invalid) {
             Valid = false;
-            Str << "Liveness error: inst " << Inst->getNumber() << " dest ";
+            Str << "Liveness error: inst " << Inst.getNumber() << " dest ";
             Dest->dump(this);
             Str << " live range " << Dest->getLiveRange() << "\n";
           }
         }
       }
-      for (SizeT I = 0; I < Inst->getSrcSize(); ++I) {
-        Operand *Src = Inst->getSrc(I);
+      for (SizeT I = 0; I < Inst.getSrcSize(); ++I) {
+        Operand *Src = Inst.getSrc(I);
         SizeT NumVars = Src->getNumVars();
         for (SizeT J = 0; J < NumVars; ++J) {
           const Variable *Var = Src->getVar(J);
           const bool IsDest = false;
           if (!Var->getIgnoreLiveness() &&
               !Var->getLiveRange().containsValue(InstNumber, IsDest)) {
             Valid = false;
-            Str << "Liveness error: inst " << Inst->getNumber() << " var ";
+            Str << "Liveness error: inst " << Inst.getNumber() << " var ";
             Var->dump(this);
             Str << " live range " << Var->getLiveRange() << "\n";
           }
         }
       }
     }
   }
   return Valid;
 }
 
@@ skipping 127 matching lines @@
     }
   }
   // Print each basic block
   for (CfgNode *Node : Nodes)
     Node->dump(this);
   if (getContext()->isVerbose(IceV_Instructions))
     Str << "}\n";
 }
 
 } // end of namespace Ice