Allow pnacl-sz to be compiled to textual bitcode records.

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.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines the basic commandline-based compile server.
 //
 //===----------------------------------------------------------------------===//
 
 #include <fstream>
 #include <iostream>
 #include <thread>
 
+#ifdef INPUT_IS_TEXTUAL_BITCODE

[Jim Stichnoth, 2015/06/21 07:09:34]

Can this be included unconditionally?  (maybe with a comment that it is only
needed for INPUT_IS_TEXTUAL_BITCODE)

[Karl, 2015/06/22 19:52:02]

Done.

+#include "llvm/Bitcode/NaCl/NaClBitcodeMungeUtils.h"
+#endif
+
 #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"
 
 #include "IceClFlags.h"
 #include "IceClFlagsExtra.h"
 #include "IceCompileServer.h"
 #include "IceELFStreamer.h"
 #include "IceGlobalContext.h"
 
 namespace Ice {
 
 namespace {
 
+#ifdef INPUT_IS_TEXTUAL_BITCODE

[Jim Stichnoth, 2015/06/21 07:09:34]

Would it be possible to define TextDataStreamer even when
INPUT_IS_TEXTUAL_BITCODE is undefined (or defined as 0)?

It's probably fine to still check the invalid combination of defines, but maybe
instead with a static assert?

static_assert(!(INPUT_IS_TEXTUAL_BITCODE && PNACL_BROWSER_TRANSLATOR),
              "Can not define ...");

[Karl, 2015/06/22 19:52:02]

Done.

+#if PNACL_BROWSER_TRANSLATOR
+#error Can not define INPUT_IS_TEXTUAL_BITCODE when building browswer translator
+#endif
+
+// 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() {}
+  ~TextDataStreamer() final {}
+  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 << "Error: " << EC.message() << "\n";
+    ErrStrm.flush();
+    delete Streamer;
+    return nullptr;
+  }
+  ErrStrm.flush();
+  return Streamer;
+}
+
+size_t TextDataStreamer::GetBytes(unsigned char *Buf, size_t Len) {
+  if (Cursor >= BitcodeBuffer.size())
+    return 0;
+  if (Cursor + Len > BitcodeBuffer.size())
+    Len = BitcodeBuffer.size() - Cursor;
+  for (size_t i = 0; i < Len; ++i)
+    Buf[i] = BitcodeBuffer[Cursor + i];
+  Cursor += Len;
+  return Len;
+}
+#endif
+
 std::unique_ptr<Ostream> makeStream(const IceString &Filename,
                                     std::error_code &EC) {
   if (Filename == "-") {
     return std::unique_ptr<Ostream>(new llvm::raw_os_ostream(std::cout));
   } else {
     return std::unique_ptr<Ostream>(
         new llvm::raw_fd_ostream(Filename, EC, llvm::sys::fs::F_None));
   }
 }
 
@@ skipping 49 matching lines @@
       *Ls << "Failed to open output file: " << ExtraFlags.getOutputFilename()
           << ":\n" << EC.message() << "\n";
       return transferErrorCode(getReturnValue(ExtraFlags, Ice::EC_Args));
     }
     Os->SetUnbuffered();
   } break;
   }
 
   IceString StrError;
   std::unique_ptr<llvm::DataStreamer> InputStream(
-      llvm::getDataFileStreamer(ExtraFlags.getIRFilename(), &StrError));
+#ifdef INPUT_IS_TEXTUAL_BITCODE

[Jim Stichnoth, 2015/06/21 07:09:34]

Hopefully you could use this instead?

INPUT_IS_TEXTUAL_BITCODE ? TextDataStreamer::create(...) :
llvm::getDataFileStreamer(...)

[Karl, 2015/06/22 19:52:01]

Done.

+      TextDataStreamer::create(ExtraFlags.getIRFilename(), &StrError)
+#else
+      llvm::getDataFileStreamer(ExtraFlags.getIRFilename(), &StrError)
+#endif
+                                                  );
   if (!StrError.empty() || !InputStream) {
     llvm::SMDiagnostic Err(ExtraFlags.getIRFilename(),
                            llvm::SourceMgr::DK_Error, StrError);
     Err.print(ExtraFlags.getAppName().c_str(), *Ls);
     return transferErrorCode(getReturnValue(ExtraFlags, Ice::EC_Bitcode));
   }
 
   Ctx.reset(
       new GlobalContext(Ls.get(), Os.get(), Ls.get(), ELFStr.get(), Flags));
   if (Ctx->getFlags().getNumTranslationThreads() != 0) {
     std::thread CompileThread([this, &ExtraFlags, &InputStream]() {
       Ctx->initParserThread();
       getCompiler().run(ExtraFlags, *Ctx.get(), std::move(InputStream));
     });
     CompileThread.join();
   } else {
     getCompiler().run(ExtraFlags, *Ctx.get(), std::move(InputStream));
   }
   transferErrorCode(getReturnValue(
       ExtraFlags, static_cast<ErrorCodes>(Ctx->getErrorStatus()->value())));
 }
 
 } // end of namespace Ice