From ef0facce3e2f2af8795a3cfba188dd87fe357f3c Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Tue, 8 Nov 2016 04:16:57 +0000 Subject: [PATCH] Bitcode: Split out block info reading into a separate function. We're about to make this more complicated. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@286206 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Bitcode/Reader/BitcodeReader.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index 576762e93c3..658e6d227e5 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -237,6 +237,7 @@ protected: BitstreamCursor Stream; std::error_code initStream(); + bool readBlockInfo(); virtual std::error_code error(const Twine &Message) = 0; virtual ~BitcodeReaderBase() = default; @@ -3758,6 +3759,11 @@ std::error_code BitcodeReader::parseBitcodeVersion() { } } + +bool BitcodeReaderBase::readBlockInfo() { + return Stream.ReadBlockInfoBlock(); +} + std::error_code BitcodeReader::parseModule(uint64_t ResumeBit, bool ShouldLazyLoadMetadata) { if (ResumeBit) @@ -3786,7 +3792,7 @@ std::error_code BitcodeReader::parseModule(uint64_t ResumeBit, return error("Invalid record"); break; case bitc::BLOCKINFO_BLOCK_ID: - if (Stream.ReadBlockInfoBlock()) + if (readBlockInfo()) return error("Malformed block"); break; case bitc::PARAMATTR_BLOCK_ID: @@ -6153,7 +6159,7 @@ std::error_code ModuleSummaryIndexBitcodeReader::parseModule() { break; case bitc::BLOCKINFO_BLOCK_ID: // Need to parse these to get abbrev ids (e.g. for VST) - if (Stream.ReadBlockInfoBlock()) + if (readBlockInfo()) return error("Malformed block"); break; case bitc::VALUE_SYMTAB_BLOCK_ID: -- 2.50.1