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

tools/pnacl-thaw/pnacl-thaw.cpp

 /* Copyright 2013 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file.
  */
 
 //===-- pnacl-thaw.cpp - The low-level NaCl bitcode thawer ----------------===//
 //
 //===----------------------------------------------------------------------===//
 //
 // Converts NaCl wire format back to LLVM bitcode.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Bitcode/NaCl/NaClReaderWriter.h"
 #include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/DataStream.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/Signals.h"
-#include "llvm/Support/StreamableMemoryObject.h"
+#include "llvm/Support/StreamingMemoryObject.h"
 #include "llvm/Support/ToolOutputFile.h"
 
 using namespace llvm;
 
 static cl::opt<std::string>
 OutputFilename("o", cl::desc("Specify thawed pexe filename"),
                cl::value_desc("filename"), cl::init("-"));
 
 static cl::opt<std::string>
 InputFilename(cl::Positional, cl::desc("<frozen file>"), cl::init("-"));
 
 static cl::opt<bool>
 VerboseErrors(
     "verbose-parse-errors",
     cl::desc("Print out more descriptive PNaCl bitcode parse errors"),
     cl::init(false));
 
 static void WriteOutputFile(const Module *M) {
 
-  std::string ErrorInfo;
+  std::error_code EC;
   std::unique_ptr<tool_output_file> Out(
-      new tool_output_file(OutputFilename.c_str(), ErrorInfo, sys::fs::F_None));
-  if (!ErrorInfo.empty()) {
-    errs() << ErrorInfo << '\n';
+      new tool_output_file(OutputFilename, EC, sys::fs::F_None));
+  if (EC) {
+    errs() << EC.message() << '\n';
     exit(1);
   }
 
   WriteBitcodeToFile(M, Out->os());
 
   // Declare success.
   Out->keep();
 }
 
 int main(int argc, char **argv) {
@@ skipping 37 matching lines @@
     if (ErrorMessage.size())
       errs() << ErrorMessage << "\n";
     else
       errs() << "bitcode didn't read correctly.\n";
     return 1;
   }
 
   WriteOutputFile(M.get());
   return 0;
 }