Rebased PNaCl localmods in LLVM to 223109

lib/Bitcode/Reader/BitcodeReader.h

Index: lib/Bitcode/Reader/BitcodeReader.h
diff --git a/lib/Bitcode/Reader/BitcodeReader.h b/lib/Bitcode/Reader/BitcodeReader.h
index 047fef8fbae558f5ff25827881a0401e1d19a1ff..dec1feed40660366b5ad43fcb5de832e36533686 100644
--- a/lib/Bitcode/Reader/BitcodeReader.h
+++ b/lib/Bitcode/Reader/BitcodeReader.h
@@ -130,7 +130,7 @@ class BitcodeReader : public GVMaterializer {
   std::unique_ptr<MemoryBuffer> Buffer;
   std::unique_ptr<BitstreamReader> StreamFile;
   BitstreamCursor Stream;
-  DataStreamer *LazyStreamer;
+  StreamingMemoryObject *LazyStreamer; // @LOCALMOD
   uint64_t NextUnreadBit;
   bool SeenValueSymbolTable;
 
@@ -210,7 +210,8 @@ public:
         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),