Fix error reporting in the PNaCl bitcode reader.

lib/IRReader/IRReader.cpp

 //===---- IRReader.cpp - Reader for LLVM IR files -------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/IRReader/IRReader.h"
@@ skipping 84 matching lines @@
     return nullptr;
   }
 
   return ParseIR(FileOrErr.get().get(), Err, Context);
 }
 
 // @LOCALMOD-BEGIN
 Module *llvm::NaClParseIR(MemoryBuffer *Buffer,
                           NaClFileFormat Format,
                           SMDiagnostic &Err,
+                          raw_ostream *Verbose,
                           LLVMContext &Context) {
   NamedRegionTimer T(TimeIRParsingName, TimeIRParsingGroupName,
                      TimePassesIsEnabled);
   if ((Format == PNaClFormat) &&
       isNaClBitcode((const unsigned char *)Buffer->getBufferStart(),
                     (const unsigned char *)Buffer->getBufferEnd())) {
-    std::string ErrMsg;
-    Module *M = NaClParseBitcodeFile(Buffer, Context, &ErrMsg);
-    if (M == 0)
+    ErrorOr<Module *> ModuleOrErr =
+        NaClParseBitcodeFile(Buffer, Context, Verbose);
+    if (std::error_code EC = ModuleOrErr.getError())
       Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error,
-                         ErrMsg);
+                         EC.message());
     // ParseBitcodeFile does not take ownership of the Buffer.
-    return M;
+    return ModuleOrErr.get();
   } else if (Format == LLVMFormat) {
     if (isBitcode((const unsigned char *)Buffer->getBufferStart(),
                   (const unsigned char *)Buffer->getBufferEnd())) {
       ErrorOr<Module *> MOrErr = parseBitcodeFile(Buffer, Context);
       if (std::error_code EC = MOrErr.getError())
         Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error,
                            EC.message());
       // ParseBitcodeFile does not take ownership of the Buffer.
       return MOrErr.get();
     }
 
     return ParseAssembly(Buffer, 0, Err, Context);
   } else {
     Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error,
                        "Did not specify correct format for file");
     return 0;
   }
 }
 
 Module *llvm::NaClParseIRFile(const std::string &Filename,
                               NaClFileFormat Format,
                               SMDiagnostic &Err,
+                              raw_ostream *Verbose,
                               LLVMContext &Context) {
   ErrorOr<std::unique_ptr<MemoryBuffer>> ErrOrFile =
       MemoryBuffer::getFileOrSTDIN(Filename);
   if (std::error_code EC = ErrOrFile.getError()) {
     Err = SMDiagnostic(Filename, SourceMgr::DK_Error,
                        "Could not open input file: " + EC.message());
     return nullptr;
   }
 
-  return NaClParseIR(ErrOrFile.get().release(), Format, Err, Context);
+  return NaClParseIR(ErrOrFile.get().release(), Format, Err, Verbose,
+                     Context);
 }
 
 // @LOCALMOD-END
 
 //===----------------------------------------------------------------------===//
 // C API.
 //===----------------------------------------------------------------------===//
 
 LLVMBool LLVMParseIRInContext(LLVMContextRef ContextRef,
                               LLVMMemoryBufferRef MemBuf, LLVMModuleRef *OutM,
@@ skipping 11 matching lines @@
       Diag.print(nullptr, os, false);
       os.flush();
 
       *OutMessage = strdup(buf.c_str());
     }
     return 1;
   }
 
   return 0;
 }