Index: llvm/lib/Bitcode/Reader/BitstreamReader.cpp
===================================================================
--- llvm/lib/Bitcode/Reader/BitstreamReader.cpp
+++ llvm/lib/Bitcode/Reader/BitstreamReader.cpp
@@ -319,9 +319,8 @@
 }
 
 bool BitstreamCursor::ReadBlockInfoBlock() {
-  // If this is the second stream to get to the block info block, skip it.
-  if (getBitStreamReader()->hasBlockInfoRecords())
-    return SkipBlock();
+  // We expect the client to read the block info block at most once.
+  assert(!getBitStreamReader()->hasBlockInfoRecords());
 
   if (EnterSubBlock(bitc::BLOCKINFO_BLOCK_ID)) return true;