From: Zachary Turner Date: Thu, 7 Dec 2017 22:51:16 +0000 (+0000) Subject: [DebugInfo] Fix register variables not showing up in pdb. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c32978de039a2bac6984844773e5ae7d640c1f4e;p=llvm [DebugInfo] Fix register variables not showing up in pdb. Previously, when linking against libcmt from the MSVC runtime, lld-link /verbose would show "Ignoring unknown symbol record with kind 0x1006". It turns out this was because TypeIndexDiscovery did not handle S_REGISTER records, so these records were not getting properly remapped. Patch by: Alexnadre Ganea Differential Revision: https://reviews.llvm.org/D40919 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@320108 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/DebugInfo/CodeView/TypeIndexDiscovery.cpp b/lib/DebugInfo/CodeView/TypeIndexDiscovery.cpp index c23fadc2304..d283e9e6d2f 100644 --- a/lib/DebugInfo/CodeView/TypeIndexDiscovery.cpp +++ b/lib/DebugInfo/CodeView/TypeIndexDiscovery.cpp @@ -392,6 +392,9 @@ static bool discoverTypeIndices(ArrayRef Content, SymbolKind Kind, case SymbolKind::S_LOCAL: Refs.push_back({TiRefKind::TypeRef, 0, 1}); // Type break; + case SymbolKind::S_REGISTER: + Refs.push_back({TiRefKind::TypeRef, 0, 1}); // Type; + break; case SymbolKind::S_CONSTANT: Refs.push_back({TiRefKind::TypeRef, 0, 1}); // Type break; diff --git a/unittests/DebugInfo/CodeView/TypeIndexDiscoveryTest.cpp b/unittests/DebugInfo/CodeView/TypeIndexDiscoveryTest.cpp index 7ceefe5d22c..0948c493ed4 100644 --- a/unittests/DebugInfo/CodeView/TypeIndexDiscoveryTest.cpp +++ b/unittests/DebugInfo/CodeView/TypeIndexDiscoveryTest.cpp @@ -537,9 +537,9 @@ TEST_F(TypeIndexIteratorTest, ManyMembers) { TEST_F(TypeIndexIteratorTest, ProcSym) { ProcSym GS(SymbolRecordKind::GlobalProcSym); - GS.FunctionType = TypeIndex(0x40); + GS.FunctionType = TypeIndex::Float32(); ProcSym LS(SymbolRecordKind::ProcSym); - LS.FunctionType = TypeIndex(0x41); + LS.FunctionType = TypeIndex::Float64(); writeSymbolRecords(GS, LS); checkTypeReferences(0, GS.FunctionType); checkTypeReferences(1, LS.FunctionType); @@ -547,11 +547,20 @@ TEST_F(TypeIndexIteratorTest, ProcSym) { TEST_F(TypeIndexIteratorTest, DataSym) { DataSym DS(SymbolRecordKind::GlobalData); - DS.Type = TypeIndex(0x40); + DS.Type = TypeIndex::Float32(); writeSymbolRecords(DS); checkTypeReferences(0, DS.Type); } +TEST_F(TypeIndexIteratorTest, RegisterSym) { + RegisterSym Reg(SymbolRecordKind::RegisterSym); + Reg.Index = TypeIndex::UInt32(); + Reg.Register = RegisterId::EAX; + Reg.Name = "Target"; + writeSymbolRecords(Reg); + checkTypeReferences(0, Reg.Index); +} + TEST_F(TypeIndexIteratorTest, CallerSym) { CallerSym Callees(SymbolRecordKind::CalleeSym); Callees.Indices.push_back(TypeIndex(1));