PNaCl localmod mods in LLVM to 223109 (local files only)

tools/pnacl-bcdis/pnacl-bcdis.cpp

 //===-- pnacl-bcdis.cpp - Disassemble pnacl bitcode -----------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 /// TODO(kschimpf): Add disassembling abbreviations.
@@ skipping 38 matching lines @@
   // Open the bitcode file and put into a buffer.
   ErrorOr<std::unique_ptr<MemoryBuffer>> ErrOrFile =
       MemoryBuffer::getFileOrSTDIN(InputFilename);
   if (std::error_code EC = ErrOrFile.getError()) {
     errs() << "Error reading '" << InputFilename << "': " << EC.message()
            << "\n";
     return true;
   }
 
   // Create a stream to output the bitcode text to.
-  std::string ErrorInfo;
-  raw_fd_ostream Output(OutputFilename.c_str(), ErrorInfo, sys::fs::F_None);
-  if (!ErrorInfo.empty()) {
-    errs() << ErrorInfo << '\n';
+  std::error_code EC;
+  raw_fd_ostream Output(OutputFilename, EC, sys::fs::F_None);
+  if (EC) {
+    errs() << EC.message() << '\n';
     return true;
   }
 
   // Parse the the bitcode file.
   return NaClObjDump(ErrOrFile.get().release(), Output, NoRecords, NoAssembly);
 }
 
 }
 
 int main(int argc, char **argv) {
   // Print a stack trace if we signal out.
   sys::PrintStackTraceOnErrorSignal();
   PrettyStackTraceProgram X(argc, argv);
   llvm_shutdown_obj Y;  // Call llvm_shutdown() on exit.
   cl::ParseCommandLineOptions(argc, argv, "pnacl-bccompress file analyzer\n");
 
   if (DisassembleBitcode()) return 1;
   return 0;
 }