diff options
4 files changed, 28 insertions, 7 deletions
diff --git a/llvm/include/llvm/DebugInfo/PDB/Native/HashTable.h b/llvm/include/llvm/DebugInfo/PDB/Native/HashTable.h index e8f08c68cd3..86c43a482b8 100644 --- a/llvm/include/llvm/DebugInfo/PDB/Native/HashTable.h +++ b/llvm/include/llvm/DebugInfo/PDB/Native/HashTable.h @@ -143,7 +143,7 @@ public: return EC; if (Present.intersects(Deleted)) return make_error<RawError>(raw_error_code::corrupt_file, - "Present bit vector interesects deleted!"); + "Present bit vector intersects deleted!"); for (uint32_t P : Present) { if (auto EC = Stream.readInteger(Buckets[P].first)) diff --git a/llvm/lib/DebugInfo/PDB/Native/NamedStreamMap.cpp b/llvm/lib/DebugInfo/PDB/Native/NamedStreamMap.cpp index a9965ff8d06..1c044e0c265 100644 --- a/llvm/lib/DebugInfo/PDB/Native/NamedStreamMap.cpp +++ b/llvm/lib/DebugInfo/PDB/Native/NamedStreamMap.cpp @@ -34,6 +34,7 @@ uint16_t NamedStreamMapTraits::hashLookupKey(StringRef S) const { // Here, the type HASH is a typedef of unsigned short. // ** It is not a bug that we truncate the result of hashStringV1, in fact // it is a bug if we do not! ** + // See NMTNI::hash() in the reference implementation. return static_cast<uint16_t>(hashStringV1(S)); } diff --git a/llvm/lib/DebugInfo/PDB/Native/PDBStringTableBuilder.cpp b/llvm/lib/DebugInfo/PDB/Native/PDBStringTableBuilder.cpp index 4b69e09a83d..eabb9d44669 100644 --- a/llvm/lib/DebugInfo/PDB/Native/PDBStringTableBuilder.cpp +++ b/llvm/lib/DebugInfo/PDB/Native/PDBStringTableBuilder.cpp @@ -26,7 +26,13 @@ StringTableHashTraits::StringTableHashTraits(PDBStringTableBuilder &Table) : Table(&Table) {} uint32_t StringTableHashTraits::hashLookupKey(StringRef S) const { - return Table->getIdForString(S); + // The reference implementation doesn't include code for /src/headerblock + // handling, but it can only read natvis entries lld's PDB files if + // this hash function truncates the hash to 16 bit. + // PDB/include/misc.h in the reference implementation has a hashSz() function + // that returns an unsigned short, that seems what's being used for + // /src/headerblock. + return static_cast<uint16_t>(Table->getIdForString(S)); } StringRef StringTableHashTraits::storageKeyToLookupKey(uint32_t Offset) const { diff --git a/llvm/unittests/DebugInfo/PDB/StringTableBuilderTest.cpp b/llvm/unittests/DebugInfo/PDB/StringTableBuilderTest.cpp index 719cb807a2b..2f7c0619440 100644 --- a/llvm/unittests/DebugInfo/PDB/StringTableBuilderTest.cpp +++ b/llvm/unittests/DebugInfo/PDB/StringTableBuilderTest.cpp @@ -19,11 +19,7 @@ using namespace llvm; using namespace llvm::pdb; using namespace llvm::support; -namespace { -class StringTableBuilderTest : public ::testing::Test {}; -} - -TEST_F(StringTableBuilderTest, Simple) { +TEST(StringTableBuilderTest, Simple) { // Create /names table contents. PDBStringTableBuilder Builder; @@ -78,3 +74,21 @@ TEST_F(StringTableBuilderTest, Simple) { EXPECT_THAT_EXPECTED(Table.getIDForString("bazz"), HasValue(BazzID)); EXPECT_THAT_EXPECTED(Table.getIDForString("barr"), HasValue(BarrID)); } + +TEST(StringTableHashTraitsTest, Simple) { + PDBStringTableBuilder Builder; + + // Create more than 64kiB of dummy entries. + for (int i = 0; i < 320; ++i) { + std::string aaaaa = std::string(220, 'a') + std::to_string(i); + Builder.insert(aaaaa); + } + + std::string S = "foo.natvis"; + uint32_t Pos = Builder.insert(S); + + EXPECT_GT(Pos, 0xFFFFu); + + StringTableHashTraits Traits(Builder); + EXPECT_LE(Traits.hashLookupKey(S), 0xFFFFu); +} |
