Bitcode streaming

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 108 matching lines @@
 
   Value *getValueFwdRef(unsigned Idx);
   void AssignValue(Value *V, unsigned Idx);
 };
 
 class BitcodeReader : public GVMaterializer {
   LLVMContext &Context;
   Module *TheModule;
   MemoryBuffer *Buffer;
   bool BufferOwned;
-  BitstreamReader StreamFile;
+  OwningPtr<BitstreamReader> StreamFile;
   BitstreamCursor Stream;
+  BitcodeStreamer* LazyStreamer;

[nlewycky, 2011/11/05 00:45:06]

* on the right

[(google.com) Derek Schuff, 2011/11/07 22:33:50]

Done.

   
   const char *ErrorString;
   
   std::vector<Type*> TypeList;
   BitcodeReaderValueList ValueList;
   BitcodeReaderMDValueList MDValueList;
   SmallVector<Instruction *, 64> InstructionList;
 
   std::vector<std::pair<GlobalVariable*, unsigned> > GlobalInits;
   std::vector<std::pair<GlobalAlias*, unsigned> > AliasInits;
@@ skipping 26 matching lines @@
   /// DeferredFunctionInfo - When function bodies are initially scanned, this
   /// map contains info about where to find deferred function body in the
   /// stream.
   DenseMap<Function*, uint64_t> DeferredFunctionInfo;
   
   /// BlockAddrFwdRefs - These are blockaddr references to basic blocks.  These
   /// are resolved lazily when functions are loaded.
   typedef std::pair<unsigned, GlobalVariable*> BlockAddrRefTy;
   DenseMap<Function*, std::vector<BlockAddrRefTy> > BlockAddrFwdRefs;
 
+
+

[nlewycky, 2011/11/05 00:45:06]

Why the two new blank lines? Please minimize your diff.

[(google.com) Derek Schuff, 2011/11/07 22:33:50]

Done.

 public:
   explicit BitcodeReader(MemoryBuffer *buffer, LLVMContext &C)
     : Context(C), TheModule(0), Buffer(buffer), BufferOwned(false),
-      ErrorString(0), ValueList(C), MDValueList(C) {
+      LazyStreamer(0), ErrorString(0), ValueList(C), MDValueList(C) {
+    HasReversedFunctionsWithBodies = false;
+  }
+  explicit BitcodeReader(BitcodeStreamer* streamer, LLVMContext &C)

[nlewycky, 2011/11/05 00:45:06]

* on the right

[(google.com) Derek Schuff, 2011/11/07 22:33:50]

Done.

+    : Context(C), TheModule(0), Buffer(0), BufferOwned(false),
+      LazyStreamer(streamer), ErrorString(0), ValueList(C), MDValueList(C) {
     HasReversedFunctionsWithBodies = false;
   }
   ~BitcodeReader() {
     FreeState();
   }
   
   void FreeState();
   
   /// setBufferOwned - If this is true, the reader will destroy the MemoryBuffer
   /// when the reader is destroyed.
@@ skipping 73 matching lines @@
 
   bool ParseOldTypeSymbolTable();   // FIXME: Remove in LLVM 3.1
   bool ParseValueSymbolTable();
   bool ParseConstants();
   bool RememberAndSkipFunctionBody();
   bool ParseFunctionBody(Function *F);
   bool ResolveGlobalAndAliasInits();
   bool ParseMetadata();
   bool ParseMetadataAttachment();
   bool ParseModuleTriple(std::string &Triple);
+  bool InitStream();
+  bool InitStreamFromBuffer();
+  bool InitLazyStream();
 };
   
 } // End llvm namespace
 
 #endif