Fix Subzero's LLVM bitcode reader to use a diagnostic handler.

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 10 matching lines @@
 #include "IceCfg.h"
 #include "IceClFlags.h"
 #include "IceClFlagsExtra.h"
 #include "IceConverter.h"
 #include "IceELFObjectWriter.h"
 #include "PNaClTranslator.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
 #include "llvm/ADT/STLExtras.h"
+#include "llvm/Bitcode/NaCl/NaClReaderWriter.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IRReader/IRReader.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/StreamingMemoryObject.h"
 #pragma clang diagnostic pop
 
 namespace Ice {
 
 namespace {
@@ skipping 91 matching lines @@
     Translator.reset(PTranslator.release());
   } else if (BuildDefs::llvmIr()) {
     if (PNACL_BROWSER_TRANSLATOR) {
       Ctx.getStrError()
           << "non BuildOnRead is not supported w/ PNACL_BROWSER_TRANSLATOR\n";
       return Ctx.getErrorStatus()->assign(EC_Args);
     }
     // Parse the input LLVM IR file into a module.
     llvm::SMDiagnostic Err;
     TimerMarker T1(Ice::TimerStack::TT_parse, &Ctx);
-    llvm::raw_ostream *Verbose =
-        ExtraFlags.getLLVMVerboseErrors() ? &llvm::errs() : nullptr;
+    llvm::DiagnosticHandlerFunction DiagnosticHandler =
+        ExtraFlags.getLLVMVerboseErrors()
+            ? redirectNaClDiagnosticToStream(llvm::errs())
+            : nullptr;
     std::unique_ptr<llvm::Module> Mod =
         NaClParseIRFile(IRFilename, ExtraFlags.getInputFileFormat(), Err,
-                        Verbose, llvm::getGlobalContext());
+                        llvm::getGlobalContext(), DiagnosticHandler);
     if (!Mod) {
       Err.print(ExtraFlags.getAppName().c_str(), llvm::errs());
       return Ctx.getErrorStatus()->assign(EC_Bitcode);
     }
 
     std::unique_ptr<Converter> Converter(new class Converter(Mod.get(), &Ctx));
     Converter->convertToIce();
     Translator.reset(Converter.release());
   } else {
     Ctx.getStrError() << "Error: Build doesn't allow LLVM IR, "
@@ skipping 22 matching lines @@
 
   if (Ctx.getFlags().getTimeEachFunction()) {
     const bool DumpCumulative = false;
     Ctx.dumpTimers(GlobalContext::TSK_Funcs, DumpCumulative);
   }
   constexpr bool FinalStats = true;
   Ctx.dumpStats("_FINAL_", FinalStats);
 }
 
 } // end of namespace Ice