Subzero: Update for LLVM 3.9 (trunk).

src/IceCompiler.cpp

 //===- subzero/src/IceCompiler.cpp - Driver for bitcode translation -------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 68 matching lines @@
   Ctx.emitFileHeader();
   Ctx.startWorkerThreads();
 
   std::unique_ptr<Translator> Translator;
   const std::string IRFilename = Flags.getIRFilename();
   const bool BuildOnRead = Flags.getBuildOnRead() && !llvmIRInput(IRFilename) &&
                            !wasmInput(IRFilename);
   const bool WasmBuildOnRead = Flags.getBuildOnRead() && wasmInput(IRFilename);
   if (BuildOnRead) {
     std::unique_ptr<PNaClTranslator> PTranslator(new PNaClTranslator(&Ctx));
+#ifdef PNACL_LLVM
     std::unique_ptr<llvm::StreamingMemoryObject> MemObj(
         new llvm::StreamingMemoryObjectImpl(InputStream.release()));
+#else  // !PNACL_LLVM
+    std::unique_ptr<llvm::StreamingMemoryObject> MemObj(
+        new llvm::StreamingMemoryObject(std::move(InputStream)));
+#endif // !PNACL_LLVM
     PTranslator->translate(IRFilename, std::move(MemObj));
     Translator.reset(PTranslator.release());
   } else if (WasmBuildOnRead) {
     if (BuildDefs::wasm()) {
 #if !ALLOW_WASM
       assert(false && "wasm not allowed");
 #else
       std::unique_ptr<WasmTranslator> WTranslator(new WasmTranslator(&Ctx));
 
       WTranslator->translate(IRFilename, std::move(InputStream));
@@ skipping 12 matching lines @@
       Ctx.getErrorStatus()->assign(EC_Args);
       Ctx.waitForWorkerThreads();
       return;
     }
     // Globals must be kept alive after lowering when converting from LLVM to
     // Ice.
     Ctx.setDisposeGlobalVariablesAfterLowering(false);
     // Parse the input LLVM IR file into a module.
     llvm::SMDiagnostic Err;
     TimerMarker T1(Ice::TimerStack::TT_parse, &Ctx);
+#ifdef PNACL_LLVM
     llvm::DiagnosticHandlerFunction DiagnosticHandler =
         Flags.getLLVMVerboseErrors()
             ? redirectNaClDiagnosticToStream(llvm::errs())
             : nullptr;
     std::unique_ptr<llvm::Module> Mod =
         NaClParseIRFile(IRFilename, Flags.getInputFileFormat(), Err,
                         llvm::getGlobalContext(), DiagnosticHandler);
+#else  // !PNACL_LLVM
+    llvm::LLVMContext Context;
+    std::unique_ptr<llvm::Module> Mod = parseIRFile(IRFilename, Err, Context);
+#endif // !PNACL_LLVM
     if (!Mod) {
       Err.print(Flags.getAppName().c_str(), llvm::errs());
       Ctx.getErrorStatus()->assign(EC_Bitcode);
       Ctx.waitForWorkerThreads();
       return;
     }
 
     std::unique_ptr<Converter> Converter(new class Converter(Mod.get(), &Ctx));
     Converter->convertToIce();
     Translator.reset(Converter.release());
@@ skipping 25 matching lines @@
     Ctx.dumpTimers();
 
   if (getFlags().getTimeEachFunction()) {
     constexpr bool NoDumpCumulative = false;
     Ctx.dumpTimers(GlobalContext::TSK_Funcs, NoDumpCumulative);
   }
   Ctx.dumpStats();
 }
 
 } // end of namespace Ice