diff --git a/clang-tools-extra/clang-doc/BitcodeWriter.cpp b/clang-tools-extra/clang-doc/BitcodeWriter.cpp
index 0fe56878ff7c..a6c9a41c2f7e 100644
--- a/clang-tools-extra/clang-doc/BitcodeWriter.cpp
+++ b/clang-tools-extra/clang-doc/BitcodeWriter.cpp
@@ -264,8 +264,8 @@ void ClangDocBitcodeWriter::emitBlockID(BlockId BID) {
   Record.push_back(BID);
   Stream.EmitRecord(llvm::bitc::BLOCKINFO_CODE_SETBID, Record);
   Stream.EmitRecord(llvm::bitc::BLOCKINFO_CODE_BLOCKNAME,
-                    ArrayRef<unsigned char>(BlockIdNameMap[BID].bytes_begin(),
-                                            BlockIdNameMap[BID].bytes_end()));
+                    ArrayRef<unsigned char>(BlockIdName.bytes_begin(),
+                                            BlockIdName.bytes_end()));
 }
 
 /// \brief Emits a record name to the BLOCKINFO block.