Fix error reporting in the PNaCl bitcode reader.

include/llvm/IRReader/IRReader.h

 //===---- llvm/IRReader/IRReader.h - Reader for LLVM IR files ---*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines functions for reading LLVM IR. They support both
@@ skipping 25 matching lines @@
 /// a Module for it. This function *never* takes ownership of Buffer.
 Module *ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err, LLVMContext &Context);
 
 /// If the given file holds a bitcode image, return a Module for it.
 /// Otherwise, attempt to parse it as LLVM Assembly and return a Module
 /// for it.
 Module *ParseIRFile(const std::string &Filename, SMDiagnostic &Err,
                     LLVMContext &Context);
 
 // @LOCALMOD-BEGIN
+class raw_ostream;
+
 // \brief Define the expected format of the file.
 enum NaClFileFormat {
   // LLVM IR source or bitcode file (as appropriate).
   LLVMFormat,
   // PNaCl bitcode file.
   PNaClFormat
 };
 
-// \brief If the given MemoryBuffer holds a bitcode image, return a Module
-// for it.  Otherwise, attempt to parse it as LLVM Assembly and return
-// a Module for it. This function *always* takes ownership of the given
-// MemoryBuffer.
+// \brief If the given MemoryBuffer holds a bitcode image, return a
+// Module for it.  Otherwise, attempt to parse it as LLVM Assembly and
+// return a Module for it. This function *always* takes ownership of
+// the given MemoryBuffer. When Format=PNaClFormat and Verbose
+// is non-null, more descriptive error messages are also written to
+// Verbose.
 Module *NaClParseIR(MemoryBuffer *Buffer,
                     NaClFileFormat Format,
                     SMDiagnostic &Err,
+                    raw_ostream *Verbose,
                     LLVMContext &Context);
 
 /// \brief If the given file holds a Bitcode image, read the file.
 /// Otherwise, attempt to parse it as LLVM assembly and return a
-/// Module for it.
+/// Module for it. When Format=PNaClFormat and Verbose
+// is non-null, more descriptive error messages are also written to
+// Verbose.
 Module *NaClParseIRFile(const std::string &Filename,
                         NaClFileFormat Format,
                         SMDiagnostic &Err,
+                        raw_ostream *Verbose,
                         LLVMContext &Context);
 // @LOCALMOD-END
 }
 
 #endif