Install notion of diagnostic handler into PNaCl bitcode readers.

tools/pnacl-llc/pnacl-llc.cpp

 //===-- pnacl-llc.cpp - PNaCl-specific llc: pexe ---> nexe  ---------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // pnacl-llc: the core of the PNaCl translator, compiling a pexe into a nexe.
@@ skipping 349 matching lines @@
   std::unique_ptr<Module> M;
   SMDiagnostic Err;
   std::string VerboseBuffer;
   raw_string_ostream VerboseStrm(VerboseBuffer);
   if (LazyBitcode) {
     std::string StrError;
     switch (InputFileFormat) {
     case PNaClFormat: {
       std::unique_ptr<StreamingMemoryObject> Cache(
           new ThreadedStreamingCache(StreamingObject));
+      DiagnosticHandlerFunction DiagnosticHandler = nullptr;
       M.reset(getNaClStreamedBitcodeModule(
-          InputFilename, Cache.release(), Context, &VerboseStrm, &StrError));
+          InputFilename, Cache.release(), Context,
+          redirectNaClDiagnosticToStream(VerboseStrm), &StrError));
       break;
     }
     case LLVMFormat: {
       std::unique_ptr<StreamingMemoryObject> Cache(
           new ThreadedStreamingCache(StreamingObject));
       ErrorOr<std::unique_ptr<Module>> MOrErr =
-          getStreamedBitcodeModule(
-          InputFilename, Cache.release(), Context);
+          getStreamedBitcodeModule(InputFilename, Cache.release(), Context,
+                                   redirectNaClDiagnosticToStream(VerboseStrm));
       M = std::move(*MOrErr);
       break;
     }
     case AutodetectFileFormat:
       report_fatal_error("Command can't autodetect file format!");
     }
     if (!StrError.empty())
       Err = SMDiagnostic(InputFilename, SourceMgr::DK_Error, StrError);
   } else {
 #if defined(PNACL_BROWSER_TRANSLATOR)
     llvm_unreachable("native client SRPC only supports streaming");
 #else
     if (AcceptBitcodeRecordText) {
       M = parseBitcodeRecordsAsText(InputFilename, Err, &VerboseStrm, Context);
     } else {
       // Parses binary bitcode as well as textual assembly
       // (so pulls in more code into pnacl-llc).
-      M = NaClParseIRFile(InputFilename, InputFileFormat, Err, &VerboseStrm,
-                          Context);
+      M = NaClParseIRFile(InputFilename, InputFileFormat, Err, Context,
+                          redirectNaClDiagnosticToStream(VerboseStrm));
     }
 #endif
   }
   if (!M) {
 #if defined(PNACL_BROWSER_TRANSLATOR)
     report_fatal_error(VerboseStrm.str() + Err.getMessage());
 #else
     // Err.print is prettier, so use it for the non-sandboxed translator.
     Err.print(ProgramName.data(), errs());
     errs() << VerboseStrm.str();
@@ skipping 416 matching lines @@
   return 0;
 }
 
 int main(int argc, char **argv) {
 #if defined(PNACL_BROWSER_TRANSLATOR)
   return srpc_main(argc, argv);
 #else
   return llc_main(argc, argv);
 #endif // PNACL_BROWSER_TRANSLATOR
 }