Fix error reporting in the PNaCl bitcode reader.

tools/llvm-nm/llvm-nm.cpp

 //===-- llvm-nm.cpp - Symbol table dumping utility for llvm ---------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This program is a utility that works like traditional Unix "nm", that is, it
@@ skipping 993 matching lines @@
       MemoryBuffer::getFileOrSTDIN(Filename);
   if (error(BufferOrErr.getError(), Filename))
     return;
 
   LLVMContext &Context = getGlobalContext();
 
   // @LOCALMOD-BEGIN
   // Support parsing PNaCl bitcode files
   /* TODO(jfb) This is currently broken: the code base now requires an Object.
   if (InputFileFormat == PNaClFormat) {
-    std::string ErrorMessage;
-    Module *Result = NaClParseBitcodeFile(BufferOrErr.get().release(), Context,
-                                          &ErrorMessage);
+    ErrorOr<Module *>Result =

[jvoung (off chromium), 2014/12/01 23:23:50]

space between > and Result

[Karl, 2014/12/03 18:32:10]

Done.

+        NaClParseBitcodeFile(BufferOrErr.get().release(), Context);
     if (Result) {
-      DumpSymbolNamesFromModule(Result);
+      DumpSymbolNamesFromModule(Result.get());
       delete Result;
     } else {
-      error(ErrorMessage, Filename);
+      error(Result.message(), Filename);
       return;
     }
   }
   */
   // @LOCALMOD-END
 
   ErrorOr<Binary *> BinaryOrErr =
       createBinary(std::move(*BufferOrErr), &Context);
   if (error(BinaryOrErr.getError(), Filename))
     return;
@@ skipping 233 matching lines @@
           "for the -s option");
 
   std::for_each(InputFilenames.begin(), InputFilenames.end(),
                 dumpSymbolNamesFromFile);
 
   if (HadError)
     return 1;
 
   return 0;
 }