From 9c78fe67ca73102492d737096951991eca07c859 Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Mon, 10 Oct 2016 23:44:04 +0000 Subject: [PATCH] Fix a bug in DbiStreamBuilder::addDbgStream. This feature will be tested in LLD unit tests. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@283824 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/DebugInfo/PDB/Raw/DbiStreamBuilder.h | 3 ++- lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/llvm/DebugInfo/PDB/Raw/DbiStreamBuilder.h b/include/llvm/DebugInfo/PDB/Raw/DbiStreamBuilder.h index 72abba891d5..52b6b8784c9 100644 --- a/include/llvm/DebugInfo/PDB/Raw/DbiStreamBuilder.h +++ b/include/llvm/DebugInfo/PDB/Raw/DbiStreamBuilder.h @@ -101,7 +101,8 @@ private: msf::WritableStreamRef NamesBuffer; msf::MutableByteStream ModInfoBuffer; msf::MutableByteStream FileInfoBuffer; - llvm::SmallVector DbgStreams; + llvm::SmallVector DbgStreams{ + (int)DbgHeaderType::Max}; }; } } diff --git a/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp b/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp index f76cb6ae5f6..55c3c0a2ca8 100644 --- a/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp +++ b/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp @@ -46,7 +46,7 @@ void DbiStreamBuilder::setMachineType(PDB_Machine M) { MachineType = M; } Error DbiStreamBuilder::addDbgStream(pdb::DbgHeaderType Type, ArrayRef Data) { - if (DbgStreams[(int)Type].StreamNumber == kInvalidStreamIndex) + if (DbgStreams[(int)Type].StreamNumber != kInvalidStreamIndex) return make_error(raw_error_code::duplicate_entry, "The specified stream type already exists"); auto ExpectedIndex = Msf.addStream(Data.size()); -- 2.11.0