From 0dc171568f4981102c284b461b9acb5b4ef44749 Mon Sep 17 00:00:00 2001 From: Mark Seaborn Date: Fri, 30 Aug 2013 19:32:15 -0700 Subject: PNaCl bitcode: Remove handling of USELIST blocks These blocks are never generated by the PNaCl bitcode writer. The code for generating them was removed when BitcodeWriter.cpp was copied to produce NaClBitcodeWriter.cpp in 5712db994c8a4abb8c2512fb2900650f8335af66. The same wasn't done when BitcodeReader.cpp was copied to produce NaClBitcodeReader.cpp, so we do this now. BUG=https://code.google.com/p/nativeclient/issues/detail?id=3590 TEST=PNaCl toolchain trybots Review URL: https://codereview.chromium.org/23598005 --- lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp | 43 --------------------------- 1 file changed, 43 deletions(-) (limited to 'lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp') diff --git a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp index 9e8c398172..87eab106a0 100644 --- a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp +++ b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp @@ -894,45 +894,6 @@ bool NaClBitcodeReader::ParseConstants() { } } -bool NaClBitcodeReader::ParseUseLists() { - DEBUG(dbgs() << "-> ParseUseLists\n"); - if (Stream.EnterSubBlock(naclbitc::USELIST_BLOCK_ID)) - return Error("Malformed block record"); - - SmallVector Record; - - // Read all the records. - while (1) { - NaClBitstreamEntry Entry = Stream.advanceSkippingSubblocks(); - - switch (Entry.Kind) { - case NaClBitstreamEntry::SubBlock: // Handled for us already. - case NaClBitstreamEntry::Error: - return Error("malformed use list block"); - case NaClBitstreamEntry::EndBlock: - DEBUG(dbgs() << "<- ParseUseLists\n"); - return false; - case NaClBitstreamEntry::Record: - // The interesting case. - break; - } - - // Read a use list record. - Record.clear(); - switch (Stream.readRecord(Entry.ID, Record)) { - default: // Default behavior: unknown type. - break; - case naclbitc::USELIST_CODE_ENTRY: { // USELIST_CODE_ENTRY: TBD. - unsigned RecordLength = Record.size(); - if (RecordLength < 1) - return Error ("Invalid UseList reader!"); - UseListRecords.push_back(Record); - break; - } - } - } -} - /// RememberAndSkipFunctionBody - When we see the block for a function body, /// remember where it is and then skip it. This lets us lazily deserialize the /// functions. @@ -1047,10 +1008,6 @@ bool NaClBitcodeReader::ParseModule(bool Resume) { return false; } break; - case naclbitc::USELIST_BLOCK_ID: - if (ParseUseLists()) - return true; - break; } continue; -- cgit v1.2.3-18-g5258