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

tools/pnacl-bccompress/pnacl-bccompress.cpp

 //===-- pnacl-bccompress.cpp - Bitcode (abbrev) compression ---------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This tool may be invoked in the following manner:
@@ skipping 1235 matching lines @@
   NaClBitstreamReader StreamFile(BufPtr, EndBufPtr);
   NaClBitstreamCursor Stream(StreamFile);
 
   // Parse the the bitcode file.
   NaClAnalyzeParser Parser(Stream, BlockAbbrevsMap);
   while (!Stream.AtEndOfStream()) {
     if (Parser.Parse()) return true;
   }
 
   if (ShowAbbreviationFrequencies || ShowValueDistributions) {
-    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";
       exit(1);
     }
     if (ShowAbbreviationFrequencies)
       DisplayAbbreviationFrequencies(Output, Parser.BlockDist, BlockAbbrevsMap);
     if (ShowValueDistributions)
       Parser.BlockDist.Print(Output);
   }
 
   AddNewAbbreviations(Parser.BlockDist, BlockAbbrevsMap);
   return false;
@@ skipping 193 matching lines @@
 
   // Set up the parser.
   NaClBitcodeCopyParser Parser(Stream, BlockAbbrevsMap, StreamWriter);
 
   // Parse the bitcode and copy.
   while (!Stream.AtEndOfStream()) {
     if (Parser.Parse()) return true;
   }
 
   // Write out the copied results.
-  std::string ErrorInfo;
+  std::error_code EC;
   std::unique_ptr<tool_output_file> OutFile(
-      new tool_output_file(OutputFilename.c_str(), ErrorInfo, sys::fs::F_None));
-  if (!ErrorInfo.empty())
-    return Error(ErrorInfo);
+      new tool_output_file(OutputFilename.c_str(), EC, sys::fs::F_None));
+  if (EC)
+    return Error(EC.message());
 
   // Write the generated bitstream to "Out".
   OutFile->os().write((char*)&OutputBuffer.front(),
                       OutputBuffer.size());
   OutFile->keep();
 
   return false;
 }
 
 // Build fast lookup abbreviation maps for each of the abbreviation blocks
@@ skipping 20 matching lines @@
   if (ReadAndBuffer(MemBuf)) return 1;
   BlockAbbrevsMapType BlockAbbrevsMap;
   if (AnalyzeBitcode(MemBuf, BlockAbbrevsMap)) return 1;
   if (ShowAbbreviationFrequencies || ShowValueDistributions) {
     return 0;
   }
   BuildAbbrevLookupMaps(BlockAbbrevsMap);
   if (CopyBitcode(MemBuf, BlockAbbrevsMap)) return 1;
   return 0;
 }