From 5c2a0fc93dfaca34d0a2d82812d34cd5c4ab814f Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Thu, 27 Oct 2016 21:39:28 +0000 Subject: [PATCH] BitcodeReader: Require clients to read the block info block at most once. This change makes it the client's responsibility to call ReadBlockInfoBlock() at most once. This is in preparation for a future change that will allow there to be multiple block info blocks. See also: http://lists.llvm.org/pipermail/llvm-dev/2016-October/106512.html Differential Revision: https://reviews.llvm.org/D26016 llvm-svn: 285350 --- lib/Bitcode/Reader/BitstreamReader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Bitcode/Reader/BitstreamReader.cpp b/lib/Bitcode/Reader/BitstreamReader.cpp index 330bc045cc6..0b549f7550f 100644 --- a/lib/Bitcode/Reader/BitstreamReader.cpp +++ b/lib/Bitcode/Reader/BitstreamReader.cpp @@ -319,9 +319,9 @@ void BitstreamCursor::ReadAbbrevRecord() { } bool BitstreamCursor::ReadBlockInfoBlock() { - // If this is the second stream to get to the block info block, skip it. + // We expect the client to read the block info block at most once. if (getBitStreamReader()->hasBlockInfoRecords()) - return SkipBlock(); + report_fatal_error("Duplicate read of block info block"); if (EnterSubBlock(bitc::BLOCKINFO_BLOCK_ID)) return true;