Changes to rebase Subzero to LLVM 223109 APIs.

src/llvm2ice.cpp

 //===- subzero/src/llvm2ice.cpp - Driver for testing ----------------------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines a driver that uses LLVM capabilities to parse a
 // bitcode file and build the LLVM IR, and then convert the LLVM basic
 // blocks, instructions, and operands into their Subzero equivalents.
 //
 //===----------------------------------------------------------------------===//
 
 #include <fstream>
 #include <iostream>
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/Module.h"
 #include "llvm/IRReader/IRReader.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/raw_os_ostream.h"
 #include "llvm/Support/SourceMgr.h"
 
 #include "IceCfg.h"
 #include "IceClFlags.h"
 #include "IceConverter.h"
 #include "IceELFObjectWriter.h"
@@ skipping 293 matching lines @@
   // With the ELF writer, use a raw_fd_ostream to allow seeking.
   // Also don't buffer, otherwise it gets pretty slow.
   std::unique_ptr<Ice::Ostream> Os;
   std::unique_ptr<Ice::ELFStreamer> ELFStr;
   std::ofstream Ofs;
   if (UseELFWriter) {
     if (OutputFilename == "-") {
       *Ls << "Error: writing binary ELF to stdout is unsupported\n";
       return GetReturnValue(Ice::EC_Args);
     }
-    std::string ErrorInfo;
+    std::error_code EC;
     raw_fd_ostream *FdOs =
-        new raw_fd_ostream(OutputFilename.c_str(), ErrorInfo, sys::fs::F_None);
+        new raw_fd_ostream(OutputFilename, EC, sys::fs::F_None);
     Os.reset(FdOs);
-    if (!ErrorInfo.empty()) {
+    if (EC) {
       *Ls << "Failed to open output file: " << OutputFilename << ":\n"
-          << ErrorInfo << "\n";
+          << EC.message() << "\n";
       return GetReturnValue(Ice::EC_Args);
     }
     ELFStr.reset(new Ice::ELFStreamer(*FdOs));
   } else {
     if (OutputFilename != "-") {
       Ofs.open(OutputFilename.c_str(), std::ofstream::out);
       Os.reset(new raw_os_ostream(Ofs));
     } else {
       Os.reset(new raw_os_ostream(std::cout));
     }
@@ skipping 16 matching lines @@
   if (BuildOnRead) {
     std::unique_ptr<Ice::PNaClTranslator> PTranslator(
         new Ice::PNaClTranslator(&Ctx, Flags));
     PTranslator->translate(IRFilename);
     Translator.reset(PTranslator.release());
   } else if (ALLOW_LLVM_IR) {
     // Parse the input LLVM IR file into a module.
     SMDiagnostic Err;
     Ice::TimerMarker T1(Ice::TimerStack::TT_parse, &Ctx);
     raw_ostream *Verbose = LLVMVerboseErrors ? &errs() : nullptr;
-    Module *Mod = NaClParseIRFile(IRFilename, InputFileFormat, Err, Verbose,
-                                  getGlobalContext());
-
+    std::unique_ptr<Module> Mod =
+        NaClParseIRFile(IRFilename, InputFileFormat, Err, Verbose,
+                        getGlobalContext());
     if (!Mod) {
       Err.print(argv[0], errs());
       return GetReturnValue(Ice::EC_Bitcode);
     }
 
     std::unique_ptr<Ice::Converter> Converter(
-        new Ice::Converter(Mod, &Ctx, Flags));
+        new Ice::Converter(Mod.get(), &Ctx, Flags));
     Converter->convertToIce();
     Translator.reset(Converter.release());
   } else {
     *Ls << "Error: Build doesn't allow LLVM IR, "
         << "--build-on-read=0 not allowed\n";
     return GetReturnValue(Ice::EC_Args);
   }
 
   Ctx.waitForWorkerThreads();
   Translator->transferErrorCode();
   Translator->emitConstants();
 
   if (UseELFWriter) {
     Ice::TimerMarker T1(Ice::TimerStack::TT_emit, &Ctx);
     Ctx.getObjectWriter()->setUndefinedSyms(Ctx.getConstantExternSyms());
     Ctx.getObjectWriter()->writeNonUserSections();
   }
   if (SubzeroTimingEnabled)
     Ctx.dumpTimers();
   if (TimeEachFunction) {
     const bool DumpCumulative = false;
     Ctx.dumpTimers(Ice::GlobalContext::TSK_Funcs, DumpCumulative);
   }
   const bool FinalStats = true;
   Ctx.dumpStats("_FINAL_", FinalStats);
   return GetReturnValue(Ctx.getErrorStatus()->value());
 }