Modify how textual bitcode is injected into pnacl-sz.

src/IceCompileServer.cpp

 //===- subzero/src/IceCompileServer.cpp - Compile server ------------------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// This file defines the basic commandline-based compile server.
 ///
 //===----------------------------------------------------------------------===//
 
 #include "IceCompileServer.h"
 
 #include "IceClFlags.h"
 #include "IceClFlagsExtra.h"
 #include "IceELFStreamer.h"
 #include "IceGlobalContext.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
 // Include code to handle converting textual bitcode records to binary (for

[Karl, 2015/07/21 21:07:01]

Removed comment, no longer dependent on ACCEPT_TEXTUAL_PNACL_BITCODE.

-// INPUT_IS_TEXTUAL_BITCODE).
+// ACCEPT_TEXTUAL_PNACL_BITCODE).
 #include "llvm/Bitcode/NaCl/NaClBitcodeMungeUtils.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/raw_os_ostream.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/StreamingMemoryObject.h"
 #pragma clang diagnostic pop
 
 #include <fstream>
 #include <iostream>
 #include <thread>
 
 namespace Ice {
 
 namespace {
 
 static_assert(!(BuildDefs::textualBitcode() && PNACL_BROWSER_TRANSLATOR),
-              "Can not define INPUT_IS_TEXTUAL_BITCODE when building browswer "
-              "translator");
+              "Can not accept textual bitcode when building "
+              "browswer translator");

[jvoung (off chromium), 2015/07/07 21:40:17]

browswer -> browser

[Karl, 2015/07/21 21:07:01]

Removed static_assert since it is no longer dependent on a build flag (just a CL
flag).

 
 // Define a SmallVector backed buffer as a data stream, so that it
 // can hold the generated binary version of the textual bitcode in the
 // input file.
 class TextDataStreamer : public llvm::DataStreamer {
 public:
   TextDataStreamer() = default;
   ~TextDataStreamer() final = default;
   static TextDataStreamer *create(const IceString &Filename, std::string *Err);
   size_t GetBytes(unsigned char *Buf, size_t Len) final;
 
 private:
   llvm::SmallVector<char, 1024> BitcodeBuffer;
   size_t Cursor = 0;
 };
 
 TextDataStreamer *TextDataStreamer::create(const IceString &Filename,
                                            std::string *Err) {
   TextDataStreamer *Streamer = new TextDataStreamer();
   llvm::raw_string_ostream ErrStrm(*Err);
   if (std::error_code EC = llvm::readNaClRecordTextAndBuildBitcode(
           Filename, Streamer->BitcodeBuffer, &ErrStrm)) {
     ErrStrm << EC.message(); // << "\n";

[jvoung (off chromium), 2015/07/07 21:40:17]

why comment out the "// << "\n";"?, and the // ErrStrm.flush(); below

[Karl, 2015/07/21 21:07:01]

I removed the '<< "\n"' because the caller expects it to be an error string
passed to llvm::SMDiagnostic, which assumes the string isn't terminated with a
newline (it adds it when printing the string message).

I'm not quite sure why the flush is commented out. Fixing.

     ErrStrm.flush();
     delete Streamer;
     return nullptr;
   }
   // ErrStrm.flush();
   return Streamer;
 }
 
 size_t TextDataStreamer::GetBytes(unsigned char *Buf, size_t Len) {
   if (Cursor >= BitcodeBuffer.size())
@@ skipping 94 matching lines @@
     });
     CompileThread.join();
   } else {
     getCompiler().run(ExtraFlags, *Ctx.get(), std::move(InputStream));
   }
   transferErrorCode(getReturnValue(
       ExtraFlags, static_cast<ErrorCodes>(Ctx->getErrorStatus()->value())));
 }
 
 } // end of namespace Ice