Install notion of diagnostic handler into PNaCl bitcode readers.

tools/pnacl-abicheck/pnacl-abicheck.cpp

 //===-- pnacl-abicheck.cpp - Check PNaCl bitcode ABI ----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This tool checks files for compliance with the PNaCl bitcode ABI
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/NaCl.h"
+#include "llvm/Bitcode/NaCl/NaClReaderWriter.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IRReader/IRReader.h"
 #include "llvm/Pass.h"
 #include "llvm/IR/LegacyPassManager.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FormattedStream.h"
 #include "llvm/Support/SourceMgr.h"
 #include <string>
@@ skipping 38 matching lines @@
 }
 
 int main(int argc, char **argv) {
   LLVMContext &Context = getGlobalContext();
   SMDiagnostic Err;
   cl::ParseCommandLineOptions(argc, argv, "PNaCl Bitcode ABI checker\n");
 
   if (Quiet)
     VerboseErrors = false;
 
-  raw_ostream *Verbose = VerboseErrors ? &errs() : nullptr;
-  std::unique_ptr<Module> Mod(
-      NaClParseIRFile(InputFilename, InputFileFormat, Err, Verbose, Context));
+  DiagnosticHandlerFunction DiagnosticHandler =
+      VerboseErrors ? redirectNaClDiagnosticToStream(errs()) : nullptr;
+  std::unique_ptr<Module> Mod(NaClParseIRFile(InputFilename, InputFileFormat,
+                                              Err, Context, DiagnosticHandler));
   if (Mod.get() == 0) {
     Err.print(argv[0], errs());
     return 1;
   }
   PNaClABIErrorReporter ABIErrorReporter;
   ABIErrorReporter.setNonFatal();
   bool ErrorsFound = false;
 
   std::unique_ptr<ModulePass> ModuleChecker(
       createPNaClABIVerifyModulePass(&ABIErrorReporter));
   ModuleChecker->doInitialization(*Mod);
   ModuleChecker->runOnModule(*Mod);
   ErrorsFound |= CheckABIVerifyErrors(ABIErrorReporter, "Module");
 
   std::unique_ptr<legacy::FunctionPassManager> PM(
       new legacy::FunctionPassManager(&*Mod));
   PM->add(createPNaClABIVerifyFunctionsPass(&ABIErrorReporter));
 
   PM->doInitialization();
   for (Module::iterator I = Mod->begin(), E = Mod->end(); I != E; ++I) {
     PM->run(*I);
     ErrorsFound |=
         CheckABIVerifyErrors(ABIErrorReporter, "Function " + I->getName());
   }
   PM->doFinalization();
 
   return ErrorsFound ? 1 : 0;
 }