Fix error reporting in the PNaCl bitcode reader.

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 305 matching lines @@
     }
     errs() << os.str();
   }
   Reporter.reset();
 }
 
 static Module* getModule(StringRef ProgramName, LLVMContext &Context,
                          StreamingMemoryObject *StreamingObject) {
   Module *M = nullptr;
   SMDiagnostic Err;
+  std::string VerboseBuffer;
+  raw_string_ostream VerboseStrm(VerboseBuffer);
   if (LazyBitcode) {
     std::string StrError;
     if (InputFileFormat == PNaClFormat) {
       M = getNaClStreamedBitcodeModule(
           InputFilename,
-          new ThreadedStreamingCache(StreamingObject), Context, &StrError);
+          new ThreadedStreamingCache(StreamingObject), Context, &VerboseStrm,
+          &StrError);
     } else if (InputFileFormat == LLVMFormat) {
       M = getStreamedBitcodeModule(
           InputFilename,
           new ThreadedStreamingCache(StreamingObject), Context, &StrError);
     } else {
       llvm_unreachable("Unknown bitcode format");
     }
     if (!StrError.empty())
       Err = SMDiagnostic(InputFilename, SourceMgr::DK_Error, StrError);
   } else {
 #if defined(__native_client__)
     llvm_unreachable("native client SRPC only supports streaming");
 #else
     // Parses binary bitcode as well as textual assembly
     // (so pulls in more code into pnacl-llc).
-    M = NaClParseIRFile(InputFilename, InputFileFormat, Err, Context);
+    M = NaClParseIRFile(InputFilename, InputFileFormat, Err, &VerboseStrm,
+                        Context);
 #endif
   }
   if (!M) {
 #if defined(__native_client__)
-    report_fatal_error(Err.getMessage());
+    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();
     return nullptr;
 #endif
   }
   return M;
 }
 
 static cl::opt<bool>
 ExternalizeAll("externalize",
                cl::desc("Externalize all symbols"),
                cl::init(false));
@@ skipping 401 matching lines @@
   return 0;
 }
 
 int main(int argc, char **argv) {
 #if defined(__native_client__)
   return srpc_main(argc, argv);
 #else
   return llc_main(argc, argv);
 #endif // __native_client__
 }