Fix error reporting in the PNaCl bitcode reader.

tools/llvm-nm/llvm-nm.cpp

Index: tools/llvm-nm/llvm-nm.cpp
diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp
index 2c346e51a1fef59b3f69ae2ef8c35027f1628db4..890b48ca111d94b833308d8afa9cf67bfdc0ae55 100644
--- a/tools/llvm-nm/llvm-nm.cpp
+++ b/tools/llvm-nm/llvm-nm.cpp
@@ -1011,14 +1011,13 @@ static void dumpSymbolNamesFromFile(std::string &Filename) {
   // 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;
     }
   }