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

tools/pnacl-bcdis/pnacl-bcdis.cpp

Index: tools/pnacl-bcdis/pnacl-bcdis.cpp
diff --git a/tools/pnacl-bcdis/pnacl-bcdis.cpp b/tools/pnacl-bcdis/pnacl-bcdis.cpp
index bd091d72f0bbca11e112d73ff099c796d5bfeab8..bb6c8e3b00a0fdc1bfb84ef72d503aba18838204 100644
--- a/tools/pnacl-bcdis/pnacl-bcdis.cpp
+++ b/tools/pnacl-bcdis/pnacl-bcdis.cpp
@@ -56,10 +56,10 @@ static bool DisassembleBitcode() {
   }
 
   // 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;
   }