Fixed subtle bug in Deserializer::JumpTo when jumping when the block-nesting

information matching did not exactly match the underlying stream's scoping
information.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44470 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Bitcode/Deserialize.h b/include/llvm/Bitcode/Deserialize.h
index 9b84c8ed4579ce63c234d1eaed8926fe4f83c33c..430100ee286756f96a911cacd4d0e74022512e01 100644 (file)
--- a/include/llvm/Bitcode/Deserialize.h
+++ b/include/llvm/Bitcode/Deserialize.h
@@ -125,7 +125,7 @@ private:
   llvm::SmallVector<Location,8> BlockStack;
   unsigned AbbrevNo;
   unsigned RecordCode;
-  Location StreamStart;
+  uint64_t StreamStart;
   
   //===----------------------------------------------------------===//
   // Public Interface.
@@ -348,7 +348,7 @@ public:
   
   bool FinishedBlock(Location BlockLoc);
   bool JumpTo(const Location& BlockLoc);
-  void Rewind() { JumpTo(StreamStart); }
+  void Rewind();
   
   bool AtEnd();
   bool inRecord();

diff --git a/lib/Bitcode/Reader/Deserialize.cpp b/lib/Bitcode/Reader/Deserialize.cpp
index f7866f85266b5dd999ff2c5bc4143ec990377b73..cb32f7d5efefd83ee10ed342e63a68292d9a2e83 100644 (file)
--- a/lib/Bitcode/Reader/Deserialize.cpp
+++ b/lib/Bitcode/Reader/Deserialize.cpp
@@ -21,9 +21,8 @@ using namespace llvm;
 
 Deserializer::Deserializer(BitstreamReader& stream)
   : Stream(stream), RecIdx(0), FreeList(NULL), AbbrevNo(0), RecordCode(0) {
-    
-  AdvanceStream();
-  if (!AtEnd()) StreamStart = BlockStack.back();
+
+    StreamStart = Stream.GetCurrentBitNo();
 }
 
 Deserializer::~Deserializer() {
@@ -165,12 +164,11 @@ bool Deserializer::JumpTo(const Location& Loc) {
     
   assert (!inRecord());
 
-//  AdvanceStream();
+  AdvanceStream();
   
-//  assert (AbbrevNo == bitc::ENTER_SUBBLOCK);
   assert (!BlockStack.empty() || AtEnd());
     
-  uint64_t LastBPos = StreamStart.BitNo;
+  uint64_t LastBPos = StreamStart;
   
   while (!BlockStack.empty()) {
     
@@ -183,8 +181,11 @@ bool Deserializer::JumpTo(const Location& Loc) {
       // destroy any accumulated context within the block scope.  We then
       // jump to the position of the block and enter it.
       Stream.JumpToBit(LastBPos);
+      
+      if (BlockStack.size() == Stream.BlockScope.size())
+        Stream.PopBlockScope();
+
       BlockStack.pop_back();
-      Stream.PopBlockScope();
       
       AbbrevNo = 0;
       AdvanceStream();      
@@ -195,14 +196,19 @@ bool Deserializer::JumpTo(const Location& Loc) {
     }
 
     // This block does not contain the block we are looking for.  Pop it.
+    if (BlockStack.size() == Stream.BlockScope.size())
+      Stream.PopBlockScope();
+    
     BlockStack.pop_back();
-    Stream.PopBlockScope();
+
   }
 
   // Check if we have popped our way to the outermost scope.  If so,
   // we need to adjust our position.
   if (BlockStack.empty()) {
-    Stream.JumpToBit(Loc.BitNo < LastBPos ? StreamStart.BitNo : LastBPos);
+    assert (Stream.BlockScope.empty());
+    
+    Stream.JumpToBit(Loc.BitNo < LastBPos ? StreamStart : LastBPos);
     AbbrevNo = 0;
     AdvanceStream();
   }
@@ -229,6 +235,18 @@ bool Deserializer::JumpTo(const Location& Loc) {
   return true;
 }
 
+void Deserializer::Rewind() {
+  while (!Stream.BlockScope.empty())
+    Stream.PopBlockScope();
+  
+  while (!BlockStack.empty())
+    BlockStack.pop_back();
+  
+  Stream.JumpToBit(StreamStart);
+  AbbrevNo = 0;
+}
+  
+
 unsigned Deserializer::getCurrentBlockID() { 
   if (!inRecord())
     AdvanceStream();