Make abbreviations explicit in pnacl-freeze/thaw.

lib/Bitcode/NaCl/Reader/NaClBitstreamReader.cpp

 //===- NaClBitstreamReader.cpp --------------------------------------------===//
 //     NaClBitstreamReader implementation
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
@@ skipping 53 matching lines @@
   // Add the abbrevs specific to this block to the CurAbbrevs list.
   if (const NaClBitstreamReader::BlockInfo *Info =
       BitStream->getBlockInfo(BlockID)) {
     for (size_t i = 0, e = Info->Abbrevs.size(); i != e; ++i) {
       CurAbbrevs.push_back(Info->Abbrevs[i]);
       CurAbbrevs.back()->addRef();
     }
   }
 
   // Get the codesize of this block.
-  CurCodeSize = ReadVBR(naclbitc::CodeLenWidth);
+  CurCodeSize = ReadIntVBR(naclbitc::CodeLenWidth);

[Karl, 2013/05/17 20:52:18]

Changed this to:
   CurCodeSize.IsFixed = ReadBool();
   CurCodeSize.NumBits = ReadVBR(naclbitc::CodeLenWidth);

   SkipToFourByteBoundary();
   unsigned NumWords = Read(naclbitc::BlockSizeWidth);
   if (NumWordsP) *NumWordsP = NumWords;
 
   // Validate that this block is sane.
   if (CurCodeSize == 0 || AtEndOfStream())

[Karl, 2013/05/17 20:52:18]

CurCodeSize -> CurCodeSize.NumBits

     return true;
 
   return false;
 }
 
 void NaClBitstreamCursor::readAbbreviatedLiteral(
     const NaClBitCodeAbbrevOp &Op,
     SmallVectorImpl<uint64_t> &Vals) {
   assert(Op.isLiteral() && "Not a literal");
   // If the abbrev specifies the literal value to use, use it.
@@ skipping 273 matching lines @@
         std::string Name;
         for (unsigned i = 1, e = Record.size(); i != e; ++i)
           Name += (char)Record[i];
         CurBlockInfo->RecordNames.push_back(std::make_pair((unsigned)Record[0],
                                                            Name));
         break;
       }
     }
   }
 }