Subzero: Auto-awesome iterators.

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 64 matching lines @@
   dump("Initial CFG");
 
   // The set of translation passes and their order are determined by
   // the target.
   getTarget()->translate();
 
   dump("Final output");
 }
 
 void Cfg::computePredecessors() {
-  for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
-    (*I)->computePredecessors();
-  }
+  for (CfgNode *Node : Nodes)
+    Node->computePredecessors();
 }
 
 void Cfg::renumberInstructions() {
   static TimerIdT IDrenumberInstructions =
       GlobalContext::getTimerID("renumberInstructions");
   TimerMarker T(IDrenumberInstructions, getContext());
   NextInstNumber = 1;
-  for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
-    (*I)->renumberInstructions();
-  }
+  for (CfgNode *Node : Nodes)
+    Node->renumberInstructions();
 }
 
 // placePhiLoads() must be called before placePhiStores().
 void Cfg::placePhiLoads() {
   static TimerIdT IDplacePhiLoads = GlobalContext::getTimerID("placePhiLoads");
   TimerMarker T(IDplacePhiLoads, getContext());
-  for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
-    (*I)->placePhiLoads();
-  }
+  for (CfgNode *Node : Nodes)
+    Node->placePhiLoads();
 }
 
 // placePhiStores() must be called after placePhiLoads().
 void Cfg::placePhiStores() {
   static TimerIdT IDplacePhiStores =
       GlobalContext::getTimerID("placePhiStores");
   TimerMarker T(IDplacePhiStores, getContext());
-  for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
-    (*I)->placePhiStores();
-  }
+  for (CfgNode *Node : Nodes)
+    Node->placePhiStores();
 }
 
 void Cfg::deletePhis() {
   static TimerIdT IDdeletePhis = GlobalContext::getTimerID("deletePhis");
   TimerMarker T(IDdeletePhis, getContext());
-  for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
-    (*I)->deletePhis();
-  }
+  for (CfgNode *Node : Nodes)
+    Node->deletePhis();
 }
 
 void Cfg::doArgLowering() {
   static TimerIdT IDdoArgLowering = GlobalContext::getTimerID("doArgLowering");
   TimerMarker T(IDdoArgLowering, getContext());
   getTarget()->lowerArguments();
 }
 
 void Cfg::doAddressOpt() {
   static TimerIdT IDdoAddressOpt = GlobalContext::getTimerID("doAddressOpt");
   TimerMarker T(IDdoAddressOpt, getContext());
-  for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
-    (*I)->doAddressOpt();
-  }
+  for (CfgNode *Node : Nodes)
+    Node->doAddressOpt();
 }
 
 void Cfg::doNopInsertion() {
   static TimerIdT IDdoNopInsertion =
       GlobalContext::getTimerID("doNopInsertion");
   TimerMarker T(IDdoNopInsertion, getContext());
-  for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
-    (*I)->doNopInsertion();
-  }
+  for (CfgNode *Node : Nodes)
+    Node->doNopInsertion();
 }
 
 void Cfg::genCode() {
   static TimerIdT IDgenCode = GlobalContext::getTimerID("genCode");
   TimerMarker T(IDgenCode, getContext());
-  for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
-    (*I)->genCode();
-  }
+  for (CfgNode *Node : Nodes)
+    Node->genCode();
 }
 
 // Compute the stack frame layout.
 void Cfg::genFrame() {
   static TimerIdT IDgenFrame = GlobalContext::getTimerID("genFrame");
   TimerMarker T(IDgenFrame, getContext());
   getTarget()->addProlog(Entry);
   // TODO: Consider folding epilog generation into the final
   // emission/assembly pass to avoid an extra iteration over the node
   // list.  Or keep a separate list of exit nodes.
-  for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
-    CfgNode *Node = *I;
+  for (CfgNode *Node : Nodes)
     if (Node->getHasReturn())
       getTarget()->addEpilog(Node);
-  }
 }
 
 // This is a lightweight version of live-range-end calculation.  Marks
 // the last use of only those variables whose definition and uses are
 // completely with a single block.  It is a quick single pass and
 // doesn't need to iterate until convergence.
 void Cfg::livenessLightweight() {
   static TimerIdT IDlivenessLightweight =
       GlobalContext::getTimerID("livenessLightweight");
   TimerMarker T(IDlivenessLightweight, getContext());
   getVMetadata()->init();
-  for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
-    (*I)->livenessLightweight();
-  }
+  for (CfgNode *Node : Nodes)
+    Node->livenessLightweight();
 }
 
 void Cfg::liveness(LivenessMode Mode) {
   static TimerIdT IDliveness = GlobalContext::getTimerID("liveness");
   TimerMarker T(IDliveness, getContext());
   Live.reset(new Liveness(this, Mode));
   getVMetadata()->init();
   Live->init();
   // Initialize with all nodes needing to be processed.
   llvm::BitVector NeedToProcess(Nodes.size(), true);
   while (NeedToProcess.any()) {
     // Iterate in reverse topological order to speed up convergence.
-    for (NodeList::reverse_iterator I = Nodes.rbegin(), E = Nodes.rend();
-         I != E; ++I) {
+    // TODO(stichnot): Use llvm::make_range with LLVM 3.5.
+    for (auto I = Nodes.rbegin(), E = Nodes.rend(); I != E; ++I) {
       CfgNode *Node = *I;
       if (NeedToProcess[Node->getIndex()]) {
         NeedToProcess[Node->getIndex()] = false;
         bool Changed = Node->liveness(getLiveness());
         if (Changed) {
           // If the beginning-of-block liveness changed since the last
           // iteration, mark all in-edges as needing to be processed.
-          const NodeList &InEdges = Node->getInEdges();
-          for (NodeList::const_iterator I1 = InEdges.begin(),
-                                        E1 = InEdges.end();
-               I1 != E1; ++I1) {
-            CfgNode *Pred = *I1;
+          for (CfgNode *Pred : Node->getInEdges())
             NeedToProcess[Pred->getIndex()] = true;
-          }
         }
       }
     }
   }
   if (Mode == Liveness_Intervals) {
     // Reset each variable's live range.
-    for (VarList::const_iterator I = Variables.begin(), E = Variables.end();
-         I != E; ++I) {
-      if (Variable *Var = *I)
-        Var->resetLiveRange();
-    }
+    for (Variable *Var : Variables)
+      Var->resetLiveRange();
   }
   // Collect timing for just the portion that constructs the live
   // range intervals based on the end-of-live-range computation, for a
   // finer breakdown of the cost.
   // Make a final pass over instructions to delete dead instructions
   // and build each Variable's live range.
   static TimerIdT IDliveRange = GlobalContext::getTimerID("liveRange");
   TimerMarker T1(IDliveRange, getContext());
-  for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
-    (*I)->livenessPostprocess(Mode, getLiveness());
-  }
+  for (CfgNode *Node : Nodes)
+    Node->livenessPostprocess(Mode, getLiveness());
   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 [1,1) 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.
     for (SizeT I = 0; I < Args.size(); ++I) {
       Variable *Arg = Args[I];
       if (!Live->getLiveRange(Arg).isEmpty()) {
@@ skipping 28 matching lines @@
 }
 
 // Traverse every Variable of every Inst and verify that it
 // appears within the Variable's computed live range.
 bool Cfg::validateLiveness() const {
   static TimerIdT IDvalidateLiveness =
       GlobalContext::getTimerID("validateLiveness");
   TimerMarker T(IDvalidateLiveness, getContext());
   bool Valid = true;
   Ostream &Str = Ctx->getStrDump();
-  for (NodeList::const_iterator I1 = Nodes.begin(), E1 = Nodes.end(); I1 != E1;
-       ++I1) {
-    CfgNode *Node = *I1;
-    InstList &Insts = Node->getInsts();
-    for (InstList::const_iterator I2 = Insts.begin(), E2 = Insts.end();
-         I2 != E2; ++I2) {
-      Inst *Inst = *I2;
+  for (CfgNode *Node : Nodes) {
+    for (Inst *Inst : Node->getInsts()) {
       if (Inst->isDeleted())
         continue;
       if (llvm::isa<InstFakeKill>(Inst))
         continue;
       InstNumberT InstNumber = Inst->getNumber();
       Variable *Dest = Inst->getDest();
       if (Dest) {
         // TODO: This instruction should actually begin Dest's live
         // range, so we could probably test that this instruction is
         // the beginning of some segment of Dest's live range.  But
@@ skipping 20 matching lines @@
         }
       }
     }
   }
   return Valid;
 }
 
 void Cfg::doBranchOpt() {
   static TimerIdT IDdoBranchOpt = GlobalContext::getTimerID("doBranchOpt");
   TimerMarker T(IDdoBranchOpt, getContext());
-  for (NodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
-    NodeList::iterator NextNode = I;
+  for (auto I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
+    auto NextNode = I;
     ++NextNode;
     (*I)->doBranchOpt(NextNode == E ? NULL : *NextNode);
   }
 }
 
 // ======================== Dump routines ======================== //
 
 void Cfg::emit() {
   static TimerIdT IDemit = GlobalContext::getTimerID("emit");
   TimerMarker T(IDemit, getContext());
@@ skipping 11 matching lines @@
   }
   Str << "\t.text\n";
   IceString MangledName = getContext()->mangleName(getFunctionName());
   if (Ctx->getFlags().FunctionSections)
     Str << "\t.section\t.text." << MangledName << ",\"ax\",@progbits\n";
   if (!getInternal()) {
     Str << "\t.globl\t" << MangledName << "\n";
     Str << "\t.type\t" << MangledName << ",@function\n";
   }
   Str << "\t.p2align " << getTarget()->getBundleAlignLog2Bytes() << ",0x";
-  llvm::ArrayRef<uint8_t> Pad = getTarget()->getNonExecBundlePadding();
-  for (llvm::ArrayRef<uint8_t>::iterator I = Pad.begin(), E = Pad.end();
-       I != E; ++I) {
-    Str.write_hex(*I);
-  }
+  for (AsmCodeByte I : getTarget()->getNonExecBundlePadding())
+    Str.write_hex(I);
   Str << "\n";
-  for (NodeList::const_iterator I = Nodes.begin(), E = Nodes.end(); I != E;
-       ++I) {
-    (*I)->emit(this);
-  }
+  for (CfgNode *Node : Nodes)
+    Node->emit(this);
   Str << "\n";
 }
 
 // Dumps the IR with an optional introductory message.
 void Cfg::dump(const IceString &Message) {
   if (!Ctx->isVerbose())
     return;
   Ostream &Str = Ctx->getStrDump();
   if (!Message.empty())
     Str << "================ " << Message << " ================\n";
   setCurrentNode(getEntryNode());
   // Print function name+args
   if (getContext()->isVerbose(IceV_Instructions)) {
     Str << "define ";
     if (getInternal())
       Str << "internal ";
     Str << ReturnType << " @" << getFunctionName() << "(";
     for (SizeT i = 0; i < Args.size(); ++i) {
       if (i > 0)
         Str << ", ";
       Str << Args[i]->getType() << " ";
       Args[i]->dump(this);
     }
     Str << ") {\n";
   }
   resetCurrentNode();
   if (getContext()->isVerbose(IceV_Liveness)) {
     // Print summary info about variables
-    for (VarList::const_iterator I = Variables.begin(), E = Variables.end();
-         I != E; ++I) {
-      Variable *Var = *I;
+    for (Variable *Var : Variables) {
       Str << "// multiblock=";
       if (getVMetadata()->isTracked(Var))
         Str << getVMetadata()->isMultiBlock(Var);
       else
         Str << "?";
       Str << " weight=" << Var->getWeight() << " ";
       Var->dump(this);
       Str << " LIVE=" << Var->getLiveRange() << "\n";
     }
   }
   // Print each basic block
-  for (NodeList::const_iterator I = Nodes.begin(), E = Nodes.end(); I != E;
-       ++I) {
-    (*I)->dump(this);
-  }
-  if (getContext()->isVerbose(IceV_Instructions)) {
+  for (CfgNode *Node : Nodes)
+    Node->dump(this);
+  if (getContext()->isVerbose(IceV_Instructions))
     Str << "}\n";
-  }
 }
 
 } // end of namespace Ice