Subzero: Switch file reading to be based on a DataStreamer and MemoryObject.

src/main.cpp

 //===- subzero/src/main.cpp - Driver for bitcode translation --------------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines a driver for translating PNaCl bitcode into native code.
 // It can either directly parse the binary bitcode file, or use LLVM routines to
 // parse a textual bitcode file into LLVM IR and then convert LLVM IR into ICE.
 // In either case, the high-level ICE is then compiled down to native code, as
 // either an ELF object file or a textual asm file.
 //
 //===----------------------------------------------------------------------===//
 
 #include <fstream>
 #include <iostream>
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IRReader/IRReader.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/raw_os_ostream.h"
 #include "llvm/Support/SourceMgr.h"
+#include "llvm/Support/StreamingMemoryObject.h"
 
 #include "IceCfg.h"
 #include "IceClFlags.h"
 #include "IceConverter.h"
 #include "IceELFObjectWriter.h"
 #include "IceELFStreamer.h"
 #include "PNaClTranslator.h"
 
 using namespace llvm;
 
@@ skipping 333 matching lines @@
     Ice::TimerMarker T1(Ice::TimerStack::TT_emit, &Ctx);
     Ctx.getObjectWriter()->writeInitialELFHeader();
   }
 
   Ctx.startWorkerThreads();
 
   std::unique_ptr<Ice::Translator> Translator;
   if (BuildOnRead) {
     std::unique_ptr<Ice::PNaClTranslator> PTranslator(
         new Ice::PNaClTranslator(&Ctx));
-    PTranslator->translate(IRFilename);
+    std::string StrError;
+    std::unique_ptr<DataStreamer> FileStreamer(
+        getDataFileStreamer(IRFilename, &StrError));
+    if (!StrError.empty() || !FileStreamer) {
+      SMDiagnostic Err(IRFilename, SourceMgr::DK_Error, StrError);
+      Err.print(argv[0], errs());
+      return GetReturnValue(Ice::EC_Bitcode);
+    }
+    std::unique_ptr<StreamingMemoryObject> MemObj(
+        new StreamingMemoryObjectImpl(FileStreamer.release()));
+    PTranslator->translate(IRFilename, std::move(MemObj));
     Translator.reset(PTranslator.release());
   } else if (ALLOW_LLVM_IR) {
     // Parse the input LLVM IR file into a module.
     SMDiagnostic Err;
     Ice::TimerMarker T1(Ice::TimerStack::TT_parse, &Ctx);
     raw_ostream *Verbose = LLVMVerboseErrors ? &errs() : nullptr;
     std::unique_ptr<Module> Mod = NaClParseIRFile(
         IRFilename, InputFileFormat, Err, Verbose, getGlobalContext());
     if (!Mod) {
       Err.print(argv[0], errs());
@@ skipping 22 matching lines @@
   if (SubzeroTimingEnabled)
     Ctx.dumpTimers();
   if (TimeEachFunction) {
     const bool DumpCumulative = false;
     Ctx.dumpTimers(Ice::GlobalContext::TSK_Funcs, DumpCumulative);
   }
   const bool FinalStats = true;
   Ctx.dumpStats("_FINAL_", FinalStats);
   return GetReturnValue(Ctx.getErrorStatus()->value());
 }