Rebased PNaCl localmods in LLVM to 223109

lib/Bitcode/Reader/BitcodeReader.h

 //===- BitcodeReader.h - Internal BitcodeReader impl ------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This header defines the BitcodeReader class.
@@ skipping 112 matching lines @@
   Value *getValueFwdRef(unsigned Idx);
   void AssignValue(Value *V, unsigned Idx);
 };
 
 class BitcodeReader : public GVMaterializer {
   LLVMContext &Context;
   Module *TheModule;
   std::unique_ptr<MemoryBuffer> Buffer;
   std::unique_ptr<BitstreamReader> StreamFile;
   BitstreamCursor Stream;
-  DataStreamer *LazyStreamer;
+  StreamingMemoryObject *LazyStreamer; // @LOCALMOD
   uint64_t NextUnreadBit;
   bool SeenValueSymbolTable;
 
   std::vector<Type*> TypeList;
   BitcodeReaderValueList ValueList;
   BitcodeReaderMDValueList MDValueList;
   std::vector<Comdat *> ComdatList;
   SmallVector<Instruction *, 64> InstructionList;
 
   std::vector<std::pair<GlobalVariable*, unsigned> > GlobalInits;
@@ skipping 59 matching lines @@
   SmallPtrSet<const Function *, 4> BlockAddressesTaken;
 
 public:
   std::error_code Error(BitcodeError E) { return make_error_code(E); }
 
   explicit BitcodeReader(MemoryBuffer *buffer, LLVMContext &C)
       : Context(C), TheModule(nullptr), Buffer(buffer), LazyStreamer(nullptr),
         NextUnreadBit(0), SeenValueSymbolTable(false), ValueList(C),
         MDValueList(C), SeenFirstFunctionBody(false), UseRelativeIDs(false),
         WillMaterializeAllForwardRefs(false) {}
-  explicit BitcodeReader(DataStreamer *streamer, LLVMContext &C)
+  // @LOCALMOD -- DataStreamer -> StreamingMemoryObject.
+  explicit BitcodeReader(StreamingMemoryObject *streamer, LLVMContext &C)
       : Context(C), TheModule(nullptr), Buffer(nullptr), LazyStreamer(streamer),
         NextUnreadBit(0), SeenValueSymbolTable(false), ValueList(C),
         MDValueList(C), SeenFirstFunctionBody(false), UseRelativeIDs(false),
         WillMaterializeAllForwardRefs(false) {}
   ~BitcodeReader() { FreeState(); }
 
   std::error_code materializeForwardReferencedFunctions();
 
   void FreeState();
 
@@ skipping 118 matching lines @@
   std::error_code InitStreamFromBuffer();
   std::error_code InitLazyStream();
   std::error_code FindFunctionInStream(
       Function *F,
       DenseMap<Function *, uint64_t>::iterator DeferredFunctionInfoIterator);
 };
 
 } // End llvm namespace
 
 #endif