diff options
author | Rui Ueyama <ruiu@google.com> | 2016-10-10 23:44:04 +0000 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2016-10-10 23:44:04 +0000 |
commit | 914eef6a640754d2506bd3e08a60c844dbd20f33 (patch) | |
tree | 517a8846affa9e1f3a3f4e8744540e153138f384 | |
parent | 70edd9e41d637596ef93e2e6c1935dabe8c24182 (diff) | |
download | bcm5719-llvm-914eef6a640754d2506bd3e08a60c844dbd20f33.tar.gz bcm5719-llvm-914eef6a640754d2506bd3e08a60c844dbd20f33.zip |
Fix a bug in DbiStreamBuilder::addDbgStream.
This feature will be tested in LLD unit tests.
llvm-svn: 283824
-rw-r--r-- | llvm/include/llvm/DebugInfo/PDB/Raw/DbiStreamBuilder.h | 3 | ||||
-rw-r--r-- | llvm/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/llvm/include/llvm/DebugInfo/PDB/Raw/DbiStreamBuilder.h b/llvm/include/llvm/DebugInfo/PDB/Raw/DbiStreamBuilder.h index 72abba891d5..52b6b8784c9 100644 --- a/llvm/include/llvm/DebugInfo/PDB/Raw/DbiStreamBuilder.h +++ b/llvm/include/llvm/DebugInfo/PDB/Raw/DbiStreamBuilder.h @@ -101,7 +101,8 @@ private: msf::WritableStreamRef NamesBuffer; msf::MutableByteStream ModInfoBuffer; msf::MutableByteStream FileInfoBuffer; - llvm::SmallVector<DebugStream, (int)DbgHeaderType::Max> DbgStreams; + llvm::SmallVector<DebugStream, (int)DbgHeaderType::Max> DbgStreams{ + (int)DbgHeaderType::Max}; }; } } diff --git a/llvm/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp b/llvm/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp index f76cb6ae5f6..55c3c0a2ca8 100644 --- a/llvm/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp +++ b/llvm/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<uint8_t> Data) { - if (DbgStreams[(int)Type].StreamNumber == kInvalidStreamIndex) + if (DbgStreams[(int)Type].StreamNumber != kInvalidStreamIndex) return make_error<RawError>(raw_error_code::duplicate_entry, "The specified stream type already exists"); auto ExpectedIndex = Msf.addStream(Data.size()); |