Subzero: Auto-awesome iterators.

src/IceTranslator.cpp

 //===- subzero/src/IceTranslator.cpp - ICE to machine code ------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines the general driver class for translating ICE to
@@ skipping 40 matching lines @@
   V->setName(StrBuf.str());
   ++NameIndex;
 }
 } // end of anonymous namespace
 
 void Translator::nameUnnamedGlobalAddresses(llvm::Module *Mod) {
   const IceString &GlobalPrefix = Flags.DefaultGlobalPrefix;
   Ostream &errs = Ctx->getStrDump();
   if (!GlobalPrefix.empty()) {
     uint32_t NameIndex = 0;
-    for (llvm::Module::global_iterator I = Mod->global_begin(),
-                                       E = Mod->global_end();
-         I != E; ++I) {
+    for (auto I = Mod->global_begin(), E = Mod->global_end(); I != E; ++I)
       setValueName(I, "global", GlobalPrefix, NameIndex, errs);
-    }
   }
   const IceString &FunctionPrefix = Flags.DefaultFunctionPrefix;
   if (FunctionPrefix.empty())
     return;
   uint32_t NameIndex = 0;
-  for (llvm::Module::iterator I = Mod->begin(), E = Mod->end(); I != E; ++I) {
-    setValueName(I, "function", FunctionPrefix, NameIndex, errs);
-  }
+  for (llvm::Function &I : *Mod)
+    setValueName(&I, "function", FunctionPrefix, NameIndex, errs);
 }
 
 void Translator::translateFcn(Cfg *Fcn) {
   Ctx->resetStats();
   Func.reset(Fcn);
   if (Ctx->getFlags().DisableInternal)
     Func->setInternal(false);
   if (Ctx->getFlags().DisableTranslation) {
     Func->dump();
   } else {
     Func->translate();
     if (Func->hasError()) {
       std::cerr << "ICE translation error: " << Func->getError() << "\n";
       ErrorStatus = true;
     }
 
     Func->emit();
     Ctx->dumpStats(Func->getFunctionName());
   }
 }
 
 void Translator::emitConstants() {
   if (!Ctx->getFlags().DisableTranslation && Func)
     Func->getTarget()->emitConstants();
 }
 
 void Translator::convertGlobals(llvm::Module *Mod) {
   std::unique_ptr<TargetGlobalInitLowering> GlobalLowering(
       TargetGlobalInitLowering::createLowering(Ctx->getTargetArch(), Ctx));
-  for (llvm::Module::const_global_iterator I = Mod->global_begin(),
-                                           E = Mod->global_end();
-       I != E; ++I) {
+  for (auto I = Mod->global_begin(), E = Mod->global_end(); I != E; ++I) {
     if (!I->hasInitializer())
       continue;
     const llvm::Constant *Initializer = I->getInitializer();
     IceString Name = I->getName();
     unsigned Align = I->getAlignment();
     uint64_t NumElements = 0;
     const char *Data = NULL;
     bool IsInternal = I->hasInternalLinkage();
     bool IsConst = I->isConstant();
     bool IsZeroInitializer = false;
@@ skipping 19 matching lines @@
     } else {
       llvm_unreachable("Unhandled global initializer");
     }
 
     GlobalLowering->lower(Name, Align, IsInternal, IsConst, IsZeroInitializer,
                           NumElements, Data,
                           Ctx->getFlags().DisableTranslation);
   }
   GlobalLowering.reset();
 }