[llvm] [Symbolize] Always use filename:line from debug info when debug info for the given address is available. (PR #128619)
Zequan Wu via llvm-commits
llvm-commits at lists.llvm.org
Thu Mar 20 21:12:22 PDT 2025
https://github.com/ZequanWu updated https://github.com/llvm/llvm-project/pull/128619
>From d76efd857f57bbce9a79caa1cbd42ae8832b6984 Mon Sep 17 00:00:00 2001
From: Zequan Wu <zequanwu at google.com>
Date: Mon, 24 Feb 2025 18:48:44 -0800
Subject: [PATCH 1/5] [Symbolize] Add DIContext APIs to return
std::optional<DILineInfo> to indicate if debug info is present or not for a
given address.
---
llvm/include/llvm/DebugInfo/BTF/BTFContext.h | 6 ++++
llvm/include/llvm/DebugInfo/DIContext.h | 6 ++++
.../llvm/DebugInfo/DWARF/DWARFContext.h | 6 ++++
llvm/include/llvm/DebugInfo/PDB/PDBContext.h | 6 ++++
llvm/lib/DebugInfo/BTF/BTFContext.cpp | 11 +++++++
llvm/lib/DebugInfo/DWARF/DWARFContext.cpp | 30 +++++++++++++++----
llvm/lib/DebugInfo/PDB/PDBContext.cpp | 11 +++++++
7 files changed, 70 insertions(+), 6 deletions(-)
diff --git a/llvm/include/llvm/DebugInfo/BTF/BTFContext.h b/llvm/include/llvm/DebugInfo/BTF/BTFContext.h
index c16bee6133220..b9c7cd5ede7bc 100644
--- a/llvm/include/llvm/DebugInfo/BTF/BTFContext.h
+++ b/llvm/include/llvm/DebugInfo/BTF/BTFContext.h
@@ -48,6 +48,12 @@ class BTFContext final : public DIContext {
std::vector<DILocal>
getLocalsForAddress(object::SectionedAddress Address) override;
+ std::optional<DILineInfo> getOptionalLineInfoForAddress(
+ object::SectionedAddress Address,
+ DILineInfoSpecifier Specifier = DILineInfoSpecifier()) override;
+ std::optional<DILineInfo>
+ getOptionalLineInfoForDataAddress(object::SectionedAddress Address) override;
+
static std::unique_ptr<BTFContext> create(
const object::ObjectFile &Obj,
std::function<void(Error)> ErrorHandler = WithColor::defaultErrorHandler);
diff --git a/llvm/include/llvm/DebugInfo/DIContext.h b/llvm/include/llvm/DebugInfo/DIContext.h
index 71685ba09d8db..d7990092ec8fa 100644
--- a/llvm/include/llvm/DebugInfo/DIContext.h
+++ b/llvm/include/llvm/DebugInfo/DIContext.h
@@ -267,6 +267,12 @@ class DIContext {
virtual std::vector<DILocal>
getLocalsForAddress(object::SectionedAddress Address) = 0;
+ virtual std::optional<DILineInfo> getOptionalLineInfoForAddress(
+ object::SectionedAddress Address,
+ DILineInfoSpecifier Specifier = DILineInfoSpecifier()) = 0;
+ virtual std::optional<DILineInfo>
+ getOptionalLineInfoForDataAddress(object::SectionedAddress Address) = 0;
+
private:
const DIContextKind Kind;
};
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h
index 0d6e2b076cc34..6ea909480926c 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h
@@ -401,6 +401,12 @@ class DWARFContext : public DIContext {
std::vector<DILocal>
getLocalsForAddress(object::SectionedAddress Address) override;
+ std::optional<DILineInfo> getOptionalLineInfoForAddress(
+ object::SectionedAddress Address,
+ DILineInfoSpecifier Specifier = DILineInfoSpecifier()) override;
+ std::optional<DILineInfo>
+ getOptionalLineInfoForDataAddress(object::SectionedAddress Address) override;
+
bool isLittleEndian() const { return DObj->isLittleEndian(); }
static unsigned getMaxSupportedVersion() { return 5; }
static bool isSupportedVersion(unsigned version) {
diff --git a/llvm/include/llvm/DebugInfo/PDB/PDBContext.h b/llvm/include/llvm/DebugInfo/PDB/PDBContext.h
index 3163c0a1dae03..1f436a705b072 100644
--- a/llvm/include/llvm/DebugInfo/PDB/PDBContext.h
+++ b/llvm/include/llvm/DebugInfo/PDB/PDBContext.h
@@ -57,6 +57,12 @@ namespace pdb {
std::vector<DILocal>
getLocalsForAddress(object::SectionedAddress Address) override;
+ std::optional<DILineInfo> getOptionalLineInfoForAddress(
+ object::SectionedAddress Address,
+ DILineInfoSpecifier Specifier = DILineInfoSpecifier()) override;
+ std::optional<DILineInfo> getOptionalLineInfoForDataAddress(
+ object::SectionedAddress Address) override;
+
private:
std::string getFunctionName(uint64_t Address, DINameKind NameKind) const;
std::unique_ptr<IPDBSession> Session;
diff --git a/llvm/lib/DebugInfo/BTF/BTFContext.cpp b/llvm/lib/DebugInfo/BTF/BTFContext.cpp
index 2e651cb378dbf..0b172bf8c3fe3 100644
--- a/llvm/lib/DebugInfo/BTF/BTFContext.cpp
+++ b/llvm/lib/DebugInfo/BTF/BTFContext.cpp
@@ -20,6 +20,17 @@ using namespace llvm;
using object::ObjectFile;
using object::SectionedAddress;
+std::optional<DILineInfo>
+BTFContext::getOptionalLineInfoForAddress(object::SectionedAddress Address,
+ DILineInfoSpecifier Specifier) {
+ return getLineInfoForAddress(Address, Specifier);
+}
+
+std::optional<DILineInfo> BTFContext::getOptionalLineInfoForDataAddress(
+ object::SectionedAddress Address) {
+ return getLineInfoForDataAddress(Address);
+}
+
DILineInfo BTFContext::getLineInfoForAddress(SectionedAddress Address,
DILineInfoSpecifier Specifier) {
const BTF::BPFLineInfo *LineInfo = BTF.findLineInfo(Address);
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
index 99e1642ff23ad..a2955cc2a7f55 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -1732,11 +1732,21 @@ DWARFContext::getLocalsForAddress(object::SectionedAddress Address) {
DILineInfo DWARFContext::getLineInfoForAddress(object::SectionedAddress Address,
DILineInfoSpecifier Spec) {
- DILineInfo Result;
+ std::optional<DILineInfo> Result =
+ getOptionalLineInfoForAddress(Address, Spec);
+ if (Result)
+ return *Result;
+ return DILineInfo();
+}
+
+std::optional<DILineInfo>
+DWARFContext::getOptionalLineInfoForAddress(object::SectionedAddress Address,
+ DILineInfoSpecifier Spec) {
DWARFCompileUnit *CU = getCompileUnitForCodeAddress(Address.Address);
if (!CU)
- return Result;
+ return std::nullopt;
+ DILineInfo Result;
getFunctionNameAndStartLineForAddress(
CU, Address.Address, Spec.FNKind, Spec.FLIKind, Result.FunctionName,
Result.StartFileName, Result.StartLine, Result.StartAddress);
@@ -1753,17 +1763,25 @@ DILineInfo DWARFContext::getLineInfoForAddress(object::SectionedAddress Address,
DILineInfo
DWARFContext::getLineInfoForDataAddress(object::SectionedAddress Address) {
- DILineInfo Result;
+ std::optional<DILineInfo> Result = getOptionalLineInfoForDataAddress(Address);
+ if (Result)
+ return *Result;
+ return DILineInfo();
+}
+
+std::optional<DILineInfo> DWARFContext::getOptionalLineInfoForDataAddress(
+ object::SectionedAddress Address) {
DWARFCompileUnit *CU = getCompileUnitForDataAddress(Address.Address);
if (!CU)
- return Result;
+ return std::nullopt;
if (DWARFDie Die = CU->getVariableForAddress(Address.Address)) {
+ DILineInfo Result;
Result.FileName = Die.getDeclFile(FileLineInfoKind::AbsoluteFilePath);
Result.Line = Die.getDeclLine();
+ return Result;
}
-
- return Result;
+ return std::nullopt;
}
DILineInfoTable DWARFContext::getLineInfoForAddressRange(
diff --git a/llvm/lib/DebugInfo/PDB/PDBContext.cpp b/llvm/lib/DebugInfo/PDB/PDBContext.cpp
index e600fb7385f13..462cb70c95579 100644
--- a/llvm/lib/DebugInfo/PDB/PDBContext.cpp
+++ b/llvm/lib/DebugInfo/PDB/PDBContext.cpp
@@ -32,6 +32,17 @@ PDBContext::PDBContext(const COFFObjectFile &Object,
void PDBContext::dump(raw_ostream &OS, DIDumpOptions DumpOpts){}
+std::optional<DILineInfo>
+PDBContext::getOptionalLineInfoForAddress(object::SectionedAddress Address,
+ DILineInfoSpecifier Specifier) {
+ return getLineInfoForAddress(Address, Specifier);
+}
+
+std::optional<DILineInfo> PDBContext::getOptionalLineInfoForDataAddress(
+ object::SectionedAddress Address) {
+ return getLineInfoForDataAddress(Address);
+}
+
DILineInfo PDBContext::getLineInfoForAddress(object::SectionedAddress Address,
DILineInfoSpecifier Specifier) {
DILineInfo Result;
>From 2ebc27af2677f4d540d27919d75d82274d520622 Mon Sep 17 00:00:00 2001
From: Zequan Wu <zequanwu at google.com>
Date: Mon, 24 Feb 2025 18:50:14 -0800
Subject: [PATCH 2/5] [Symbolize] Always use filename:line from debug info when
debug info for the given address is available.
---
.../Symbolize/SymbolizableObjectFile.cpp | 27 ++-
.../llvm-symbolizer/debug-info-line-info.yaml | 175 ++++++++++++++++++
2 files changed, 192 insertions(+), 10 deletions(-)
create mode 100644 llvm/test/tools/llvm-symbolizer/debug-info-line-info.yaml
diff --git a/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp b/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp
index d5e1dc759df5c..69cf992a26842 100644
--- a/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp
+++ b/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp
@@ -276,9 +276,12 @@ SymbolizableObjectFile::symbolizeCode(object::SectionedAddress ModuleOffset,
if (ModuleOffset.SectionIndex == object::SectionedAddress::UndefSection)
ModuleOffset.SectionIndex =
getModuleSectionIndexForAddress(ModuleOffset.Address);
- DILineInfo LineInfo =
- DebugInfoContext->getLineInfoForAddress(ModuleOffset, LineInfoSpecifier);
-
+ DILineInfo LineInfo;
+ std::optional<DILineInfo> DBGLineInfo =
+ DebugInfoContext->getOptionalLineInfoForAddress(ModuleOffset,
+ LineInfoSpecifier);
+ if (DBGLineInfo)
+ LineInfo = *DBGLineInfo;
// Override function name from symbol table if necessary.
if (shouldOverrideWithSymbolTable(LineInfoSpecifier.FNKind, UseSymbolTable)) {
std::string FunctionName, FileName;
@@ -287,7 +290,7 @@ SymbolizableObjectFile::symbolizeCode(object::SectionedAddress ModuleOffset,
FileName)) {
LineInfo.FunctionName = FunctionName;
LineInfo.StartAddress = Start;
- if (LineInfo.FileName == DILineInfo::BadString && !FileName.empty())
+ if (!DBGLineInfo && !FileName.empty())
LineInfo.FileName = FileName;
}
}
@@ -304,8 +307,11 @@ DIInliningInfo SymbolizableObjectFile::symbolizeInlinedCode(
ModuleOffset, LineInfoSpecifier);
// Make sure there is at least one frame in context.
- if (InlinedContext.getNumberOfFrames() == 0)
+ bool EmptyFrameAdded = false;
+ if (InlinedContext.getNumberOfFrames() == 0) {
+ EmptyFrameAdded = true;
InlinedContext.addFrame(DILineInfo());
+ }
// Override the function name in lower frame with name from symbol table.
if (shouldOverrideWithSymbolTable(LineInfoSpecifier.FNKind, UseSymbolTable)) {
@@ -317,7 +323,7 @@ DIInliningInfo SymbolizableObjectFile::symbolizeInlinedCode(
InlinedContext.getNumberOfFrames() - 1);
LI->FunctionName = FunctionName;
LI->StartAddress = Start;
- if (LI->FileName == DILineInfo::BadString && !FileName.empty())
+ if (EmptyFrameAdded && !FileName.empty())
LI->FileName = FileName;
}
}
@@ -334,10 +340,11 @@ DIGlobal SymbolizableObjectFile::symbolizeData(
Res.DeclFile = FileName;
// Try and get a better filename:lineno pair from the debuginfo, if present.
- DILineInfo DL = DebugInfoContext->getLineInfoForDataAddress(ModuleOffset);
- if (DL.Line != 0) {
- Res.DeclFile = DL.FileName;
- Res.DeclLine = DL.Line;
+ std::optional<DILineInfo> DL =
+ DebugInfoContext->getOptionalLineInfoForDataAddress(ModuleOffset);
+ if (DL) {
+ Res.DeclFile = DL->FileName;
+ Res.DeclLine = DL->Line;
}
return Res;
}
diff --git a/llvm/test/tools/llvm-symbolizer/debug-info-line-info.yaml b/llvm/test/tools/llvm-symbolizer/debug-info-line-info.yaml
new file mode 100644
index 0000000000000..94460e586a540
--- /dev/null
+++ b/llvm/test/tools/llvm-symbolizer/debug-info-line-info.yaml
@@ -0,0 +1,175 @@
+# Test llvm-symbolizer always uses line info from debug info if present.
+# RUN: yaml2obj %s -o %t
+# RUN: llvm-symbolizer --obj=%t 0x1 | FileCheck %s
+
+# CHECK: foo(bool)
+# CHECK-NEXT: ??:0:0
+
+--- !ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_X86_64
+ SectionHeaderStringTable: .strtab
+Sections:
+ - Name: .text
+ Type: SHT_PROGBITS
+ Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
+ AddressAlign: 0x10
+ Content: 50E80000000031C059C3
+ - Name: .debug_abbrev
+ Type: SHT_PROGBITS
+ AddressAlign: 0x1
+ Content: 01110025251305032572171017111B12067317000000
+ - Name: .debug_info
+ Type: SHT_PROGBITS
+ AddressAlign: 0x1
+ Content: 1E000000050001080000000001002100010000000000000000000A00000000000000
+ - Name: .debug_str_offsets
+ Type: SHT_PROGBITS
+ AddressAlign: 0x1
+ Content: 0C000000050000000000000000000000
+ - Name: .debug_line
+ Type: SHT_PROGBITS
+ AddressAlign: 0x1
+ Content: 5C0000000500080037000000010101FB0E0D00010101010000000100000101011F010000000003011F020F051E0100000000009C5BB3AA3D0567AB9CB3F5A35C9F9B230400000902000000000000000013061E0505060A5F060B2E0202000101
+ - Name: .debug_line_str
+ Type: SHT_PROGBITS
+ Flags: [ SHF_MERGE, SHF_STRINGS ]
+ AddressAlign: 0x1
+ EntSize: 0x1
+ Content: 003C696E76616C69643E00
+ - Name: .rela.text
+ Type: SHT_RELA
+ Flags: [ SHF_INFO_LINK ]
+ Link: .symtab
+ AddressAlign: 0x8
+ Info: .text
+ Relocations:
+ - Offset: 0x2
+ Symbol: _Z3barv
+ Type: R_X86_64_PLT32
+ Addend: -4
+ - Name: .rela.debug_info
+ Type: SHT_RELA
+ Flags: [ SHF_INFO_LINK ]
+ Link: .symtab
+ AddressAlign: 0x8
+ Info: .debug_info
+ Relocations:
+ - Offset: 0x8
+ Symbol: .debug_abbrev
+ Type: R_X86_64_32
+ - Offset: 0x11
+ Symbol: .debug_str_offsets
+ Type: R_X86_64_32
+ Addend: 8
+ - Offset: 0x15
+ Symbol: .debug_line
+ Type: R_X86_64_32
+ - Offset: 0x1E
+ Symbol: .debug_addr
+ Type: R_X86_64_32
+ Addend: 8
+ - Name: .rela.debug_str_offsets
+ Type: SHT_RELA
+ Flags: [ SHF_INFO_LINK ]
+ Link: .symtab
+ AddressAlign: 0x8
+ Info: .debug_str_offsets
+ Relocations:
+ - Offset: 0x8
+ Symbol: .debug_str
+ Type: R_X86_64_32
+ - Offset: 0xC
+ Symbol: .debug_str
+ Type: R_X86_64_32
+ Addend: 24
+ - Name: .rela.debug_addr
+ Type: SHT_RELA
+ Flags: [ SHF_INFO_LINK ]
+ Link: .symtab
+ AddressAlign: 0x8
+ Info: .debug_addr
+ Relocations:
+ - Offset: 0x8
+ Symbol: .text
+ Type: R_X86_64_64
+ - Name: .rela.debug_line
+ Type: SHT_RELA
+ Flags: [ SHF_INFO_LINK ]
+ Link: .symtab
+ AddressAlign: 0x8
+ Info: .debug_line
+ Relocations:
+ - Offset: 0x22
+ Symbol: .debug_line_str
+ Type: R_X86_64_32
+ - Offset: 0x2E
+ Symbol: .debug_line_str
+ Type: R_X86_64_32
+ Addend: 1
+ - Offset: 0x48
+ Symbol: .text
+ Type: R_X86_64_64
+ - Type: SectionHeaderTable
+ Sections:
+ - Name: .strtab
+ - Name: .text
+ - Name: .rela.text
+ - Name: .debug_abbrev
+ - Name: .debug_info
+ - Name: .rela.debug_info
+ - Name: .debug_str_offsets
+ - Name: .rela.debug_str_offsets
+ - Name: .debug_str
+ - Name: .debug_addr
+ - Name: .rela.debug_addr
+ - Name: .debug_line
+ - Name: .rela.debug_line
+ - Name: .debug_line_str
+ - Name: .symtab
+Symbols:
+ - Name: main.cpp
+ Type: STT_FILE
+ Index: SHN_ABS
+ - Name: .text
+ Type: STT_SECTION
+ Section: .text
+ - Name: .debug_abbrev
+ Type: STT_SECTION
+ Section: .debug_abbrev
+ - Name: .debug_str_offsets
+ Type: STT_SECTION
+ Section: .debug_str_offsets
+ - Name: .debug_str
+ Type: STT_SECTION
+ Section: .debug_str
+ - Name: .debug_addr
+ Type: STT_SECTION
+ Section: .debug_addr
+ - Name: .debug_line
+ Type: STT_SECTION
+ Section: .debug_line
+ - Name: .debug_line_str
+ Type: STT_SECTION
+ Section: .debug_line_str
+ - Name: _Z3foob
+ Type: STT_FUNC
+ Section: .text
+ Binding: STB_LOCAL
+ Size: 0xA
+ - Name: _Z3barv
+ Binding: STB_LOCAL
+DWARF:
+ debug_str:
+ - clang version 21.0.0git
+ - '<invalid>'
+ debug_addr:
+ - Length: 0xC
+ Version: 0x5
+ AddressSize: 0x8
+ Entries:
+ - {}
+...
>From 63d31145bafe580826fd4bcbbc8d98c81ce3c55f Mon Sep 17 00:00:00 2001
From: Zequan Wu <zequanwu at google.com>
Date: Tue, 18 Mar 2025 17:55:04 -0700
Subject: [PATCH 3/5] Add back missing changes on symbolizeCode.
---
llvm/lib/DebugInfo/DWARF/DWARFContext.cpp | 20 +++++++++----------
.../Symbolize/SymbolizableObjectFile.cpp | 12 +++++++----
.../llvm-symbolizer/debug-info-line-info.yaml | 1 +
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
index 624de88965682..2a4a152ca45c1 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -1738,18 +1738,16 @@ DWARFContext::getLineInfoForAddress(object::SectionedAddress Address,
return std::nullopt;
DILineInfo Result;
- bool HasDebugInfoForAddress = getFunctionNameAndStartLineForAddress(
- CU, Address.Address, Spec.FNKind, Spec.FLIKind, Result.FunctionName,
- Result.StartFileName, Result.StartLine, Result.StartAddress);
- if (Spec.FLIKind != FileLineInfoKind::None) {
- if (const DWARFLineTable *LineTable = getLineTableForUnit(CU)) {
- HasDebugInfoForAddress |= LineTable->getFileLineInfoForAddress(
- {Address.Address, Address.SectionIndex}, Spec.ApproximateLine,
- CU->getCompilationDir(), Spec.FLIKind, Result);
- }
+ getFunctionNameAndStartLineForAddress(
+ CU, Address.Address, Spec.FNKind, Spec.FLIKind, Result.FunctionName,
+ Result.StartFileName, Result.StartLine, Result.StartAddress);
+if (Spec.FLIKind != FileLineInfoKind::None) {
+ if (const DWARFLineTable *LineTable = getLineTableForUnit(CU)) {
+ LineTable->getFileLineInfoForAddress(
+ {Address.Address, Address.SectionIndex}, Spec.ApproximateLine,
+ CU->getCompilationDir(), Spec.FLIKind, Result);
}
- if (!HasDebugInfoForAddress)
- return std::nullopt;
+}
return Result;
}
diff --git a/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp b/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp
index 675ebf8ff206b..29fd4d9fda7ad 100644
--- a/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp
+++ b/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp
@@ -277,9 +277,9 @@ SymbolizableObjectFile::symbolizeCode(object::SectionedAddress ModuleOffset,
ModuleOffset.SectionIndex =
getModuleSectionIndexForAddress(ModuleOffset.Address);
DILineInfo LineInfo;
- if (std::optional<DILineInfo> DBGLineInfo =
- DebugInfoContext->getLineInfoForAddress(ModuleOffset,
- LineInfoSpecifier))
+ std::optional<DILineInfo> DBGLineInfo =
+ DebugInfoContext->getLineInfoForAddress(ModuleOffset, LineInfoSpecifier);
+ if (DBGLineInfo)
LineInfo = *DBGLineInfo;
// Override function name from symbol table if necessary.
@@ -290,7 +290,9 @@ SymbolizableObjectFile::symbolizeCode(object::SectionedAddress ModuleOffset,
FileName)) {
LineInfo.FunctionName = FunctionName;
LineInfo.StartAddress = Start;
- if (LineInfo.FileName == DILineInfo::BadString && !FileName.empty())
+ // Only use the filename from symbol table if the debug info for the
+ // address is missing.
+ if (!DBGLineInfo && !FileName.empty())
LineInfo.FileName = FileName;
}
}
@@ -323,6 +325,8 @@ DIInliningInfo SymbolizableObjectFile::symbolizeInlinedCode(
InlinedContext.getNumberOfFrames() - 1);
LI->FunctionName = FunctionName;
LI->StartAddress = Start;
+ // Only use the filename from symbol table if the debug info for the
+ // address is missing.
if (EmptyFrameAdded && !FileName.empty())
LI->FileName = FileName;
}
diff --git a/llvm/test/tools/llvm-symbolizer/debug-info-line-info.yaml b/llvm/test/tools/llvm-symbolizer/debug-info-line-info.yaml
index 94460e586a540..6326a3cd3555c 100644
--- a/llvm/test/tools/llvm-symbolizer/debug-info-line-info.yaml
+++ b/llvm/test/tools/llvm-symbolizer/debug-info-line-info.yaml
@@ -1,6 +1,7 @@
# Test llvm-symbolizer always uses line info from debug info if present.
# RUN: yaml2obj %s -o %t
# RUN: llvm-symbolizer --obj=%t 0x1 | FileCheck %s
+# RUN: llvm-symbolizer --inlining=false --obj=%t 0x1 | FileCheck %s
# CHECK: foo(bool)
# CHECK-NEXT: ??:0:0
>From 437c2c7450ed519f3264993afa9d1b6a6516935e Mon Sep 17 00:00:00 2001
From: Zequan Wu <zequanwu at google.com>
Date: Tue, 18 Mar 2025 18:01:41 -0700
Subject: [PATCH 4/5] format
---
llvm/lib/DebugInfo/DWARF/DWARFContext.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
index 2a4a152ca45c1..e76e518ef8595 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -1739,15 +1739,15 @@ DWARFContext::getLineInfoForAddress(object::SectionedAddress Address,
DILineInfo Result;
getFunctionNameAndStartLineForAddress(
- CU, Address.Address, Spec.FNKind, Spec.FLIKind, Result.FunctionName,
- Result.StartFileName, Result.StartLine, Result.StartAddress);
-if (Spec.FLIKind != FileLineInfoKind::None) {
- if (const DWARFLineTable *LineTable = getLineTableForUnit(CU)) {
- LineTable->getFileLineInfoForAddress(
- {Address.Address, Address.SectionIndex}, Spec.ApproximateLine,
- CU->getCompilationDir(), Spec.FLIKind, Result);
+ CU, Address.Address, Spec.FNKind, Spec.FLIKind, Result.FunctionName,
+ Result.StartFileName, Result.StartLine, Result.StartAddress);
+ if (Spec.FLIKind != FileLineInfoKind::None) {
+ if (const DWARFLineTable *LineTable = getLineTableForUnit(CU)) {
+ LineTable->getFileLineInfoForAddress(
+ {Address.Address, Address.SectionIndex}, Spec.ApproximateLine,
+ CU->getCompilationDir(), Spec.FLIKind, Result);
+ }
}
-}
return Result;
}
>From f97b6e69289ba23f43efbe6b755fb23ca44ab9e8 Mon Sep 17 00:00:00 2001
From: Zequan Wu <zequanwu at google.com>
Date: Thu, 20 Mar 2025 21:11:58 -0700
Subject: [PATCH 5/5] Replace test case with assembly file.
---
.../llvm-symbolizer/debug-info-line-info.yaml | 176 -------------
.../use-debug-info-line-info.s | 237 ++++++++++++++++++
2 files changed, 237 insertions(+), 176 deletions(-)
delete mode 100644 llvm/test/tools/llvm-symbolizer/debug-info-line-info.yaml
create mode 100644 llvm/test/tools/llvm-symbolizer/use-debug-info-line-info.s
diff --git a/llvm/test/tools/llvm-symbolizer/debug-info-line-info.yaml b/llvm/test/tools/llvm-symbolizer/debug-info-line-info.yaml
deleted file mode 100644
index 6326a3cd3555c..0000000000000
--- a/llvm/test/tools/llvm-symbolizer/debug-info-line-info.yaml
+++ /dev/null
@@ -1,176 +0,0 @@
-# Test llvm-symbolizer always uses line info from debug info if present.
-# RUN: yaml2obj %s -o %t
-# RUN: llvm-symbolizer --obj=%t 0x1 | FileCheck %s
-# RUN: llvm-symbolizer --inlining=false --obj=%t 0x1 | FileCheck %s
-
-# CHECK: foo(bool)
-# CHECK-NEXT: ??:0:0
-
---- !ELF
-FileHeader:
- Class: ELFCLASS64
- Data: ELFDATA2LSB
- Type: ET_REL
- Machine: EM_X86_64
- SectionHeaderStringTable: .strtab
-Sections:
- - Name: .text
- Type: SHT_PROGBITS
- Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
- AddressAlign: 0x10
- Content: 50E80000000031C059C3
- - Name: .debug_abbrev
- Type: SHT_PROGBITS
- AddressAlign: 0x1
- Content: 01110025251305032572171017111B12067317000000
- - Name: .debug_info
- Type: SHT_PROGBITS
- AddressAlign: 0x1
- Content: 1E000000050001080000000001002100010000000000000000000A00000000000000
- - Name: .debug_str_offsets
- Type: SHT_PROGBITS
- AddressAlign: 0x1
- Content: 0C000000050000000000000000000000
- - Name: .debug_line
- Type: SHT_PROGBITS
- AddressAlign: 0x1
- Content: 5C0000000500080037000000010101FB0E0D00010101010000000100000101011F010000000003011F020F051E0100000000009C5BB3AA3D0567AB9CB3F5A35C9F9B230400000902000000000000000013061E0505060A5F060B2E0202000101
- - Name: .debug_line_str
- Type: SHT_PROGBITS
- Flags: [ SHF_MERGE, SHF_STRINGS ]
- AddressAlign: 0x1
- EntSize: 0x1
- Content: 003C696E76616C69643E00
- - Name: .rela.text
- Type: SHT_RELA
- Flags: [ SHF_INFO_LINK ]
- Link: .symtab
- AddressAlign: 0x8
- Info: .text
- Relocations:
- - Offset: 0x2
- Symbol: _Z3barv
- Type: R_X86_64_PLT32
- Addend: -4
- - Name: .rela.debug_info
- Type: SHT_RELA
- Flags: [ SHF_INFO_LINK ]
- Link: .symtab
- AddressAlign: 0x8
- Info: .debug_info
- Relocations:
- - Offset: 0x8
- Symbol: .debug_abbrev
- Type: R_X86_64_32
- - Offset: 0x11
- Symbol: .debug_str_offsets
- Type: R_X86_64_32
- Addend: 8
- - Offset: 0x15
- Symbol: .debug_line
- Type: R_X86_64_32
- - Offset: 0x1E
- Symbol: .debug_addr
- Type: R_X86_64_32
- Addend: 8
- - Name: .rela.debug_str_offsets
- Type: SHT_RELA
- Flags: [ SHF_INFO_LINK ]
- Link: .symtab
- AddressAlign: 0x8
- Info: .debug_str_offsets
- Relocations:
- - Offset: 0x8
- Symbol: .debug_str
- Type: R_X86_64_32
- - Offset: 0xC
- Symbol: .debug_str
- Type: R_X86_64_32
- Addend: 24
- - Name: .rela.debug_addr
- Type: SHT_RELA
- Flags: [ SHF_INFO_LINK ]
- Link: .symtab
- AddressAlign: 0x8
- Info: .debug_addr
- Relocations:
- - Offset: 0x8
- Symbol: .text
- Type: R_X86_64_64
- - Name: .rela.debug_line
- Type: SHT_RELA
- Flags: [ SHF_INFO_LINK ]
- Link: .symtab
- AddressAlign: 0x8
- Info: .debug_line
- Relocations:
- - Offset: 0x22
- Symbol: .debug_line_str
- Type: R_X86_64_32
- - Offset: 0x2E
- Symbol: .debug_line_str
- Type: R_X86_64_32
- Addend: 1
- - Offset: 0x48
- Symbol: .text
- Type: R_X86_64_64
- - Type: SectionHeaderTable
- Sections:
- - Name: .strtab
- - Name: .text
- - Name: .rela.text
- - Name: .debug_abbrev
- - Name: .debug_info
- - Name: .rela.debug_info
- - Name: .debug_str_offsets
- - Name: .rela.debug_str_offsets
- - Name: .debug_str
- - Name: .debug_addr
- - Name: .rela.debug_addr
- - Name: .debug_line
- - Name: .rela.debug_line
- - Name: .debug_line_str
- - Name: .symtab
-Symbols:
- - Name: main.cpp
- Type: STT_FILE
- Index: SHN_ABS
- - Name: .text
- Type: STT_SECTION
- Section: .text
- - Name: .debug_abbrev
- Type: STT_SECTION
- Section: .debug_abbrev
- - Name: .debug_str_offsets
- Type: STT_SECTION
- Section: .debug_str_offsets
- - Name: .debug_str
- Type: STT_SECTION
- Section: .debug_str
- - Name: .debug_addr
- Type: STT_SECTION
- Section: .debug_addr
- - Name: .debug_line
- Type: STT_SECTION
- Section: .debug_line
- - Name: .debug_line_str
- Type: STT_SECTION
- Section: .debug_line_str
- - Name: _Z3foob
- Type: STT_FUNC
- Section: .text
- Binding: STB_LOCAL
- Size: 0xA
- - Name: _Z3barv
- Binding: STB_LOCAL
-DWARF:
- debug_str:
- - clang version 21.0.0git
- - '<invalid>'
- debug_addr:
- - Length: 0xC
- Version: 0x5
- AddressSize: 0x8
- Entries:
- - {}
-...
diff --git a/llvm/test/tools/llvm-symbolizer/use-debug-info-line-info.s b/llvm/test/tools/llvm-symbolizer/use-debug-info-line-info.s
new file mode 100644
index 0000000000000..3108b813b8624
--- /dev/null
+++ b/llvm/test/tools/llvm-symbolizer/use-debug-info-line-info.s
@@ -0,0 +1,237 @@
+# Test llvm-symbolizer always uses line info from debug info if present.
+
+# It's produced by the following steps.
+# 1. Compile with "clang++ test.ll -S -o test.s".
+# 2. Replace all "test.ll" with "<invalid>"" except the "test.ll" in first line.
+# 3. Replace "/" in Linfo_string2 with "".
+# source:
+# ; ModuleID = 'test.ll'
+# source_filename = "test.ll"
+# ; Function Attrs: nounwind
+# define void @foo(i32 %i) local_unnamed_addr #0 !dbg !5 {
+# entry:
+# #dbg_value(i32 0, !9, !DIExpression(), !11)
+# switch i32 %i, label %if.end3 [
+# i32 5, label %if.end3.sink.split
+# i32 7, label %if.end3.sink.split
+# ], !dbg !11
+# if.end3.sink.split: ; preds = %entry, %entry
+# tail call void @bar() #0, !dbg !12
+# br label %if.end3, !dbg !13
+# if.end3: ; preds = %if.end3.sink.split, %entry
+# tail call void @bar() #0, !dbg !13
+# ret void, !dbg !14
+# }
+# declare dso_local void @bar()
+# attributes #0 = { nounwind }
+# !llvm.dbg.cu = !{!0}
+# !llvm.debugify = !{!2, !3}
+# !llvm.module.flags = !{!4}
+# !0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug)
+# !1 = !DIFile(filename: "test.ll", directory: "/")
+# !2 = !{i32 7}
+# !3 = !{i32 1}
+# !4 = !{i32 2, !"Debug Info Version", i32 3}
+# !5 = distinct !DISubprogram(name: "foo", linkageName: "foo", scope: null, file: !1, line: 1, type: !6, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !8)
+# !6 = !DISubroutineType(types: !7)
+# !7 = !{}
+# !8 = !{!9}
+# !9 = !DILocalVariable(name: "1", scope: !5, file: !1, line: 1, type: !10)
+# !10 = !DIBasicType(name: "ty32", size: 32, encoding: DW_ATE_unsigned)
+# !11 = !DILocation(line: 1, column: 1, scope: !5)
+# !12 = !DILocation(line: 0, scope: !5)
+# !13 = !DILocation(line: 6, column: 1, scope: !5)
+# !14 = !DILocation(line: 7, column: 1, scope: !5)
+
+
+# RUN: llvm-mc -filetype=obj %s -o %t
+# RUN: llvm-symbolizer --obj=%t 0xd | FileCheck %s
+# RUN: llvm-symbolizer --inlining=false --obj=%t 0xd | FileCheck %s
+# CHECK: foo
+# CHECK-NEXT: ??:0:0
+
+ .file "test.ll"
+ .text
+ .p2align 4
+ .type foo, at function
+foo: # @foo
+.Lfunc_begin0:
+ .file 1 "<invalid>"
+ .loc 1 1 0 # <invalid>:1:0
+ .cfi_sections .debug_frame
+ .cfi_startproc
+# %bb.0: # %entry
+ pushq %rax
+ .cfi_def_cfa_offset 16
+ movl %edi, %eax
+.Ltmp0:
+ #DEBUG_VALUE: foo:1 <- 0
+ .loc 1 1 1 prologue_end # <invalid>:1:1
+ orl $2, %eax
+ subl $7, %eax
+ je .LBB0_1
+ jmp .LBB0_2
+.Ltmp1:
+.LBB0_1: # %if.end3.sink.split
+ #DEBUG_VALUE: foo:1 <- 0
+ .loc 1 0 0 is_stmt 0 # <invalid>:0
+ callq bar
+.Ltmp2:
+.LBB0_2: # %if.end3
+ #DEBUG_VALUE: foo:1 <- 0
+ .loc 1 6 1 epilogue_begin is_stmt 1 # <invalid>:6:1
+ popq %rax
+ .cfi_def_cfa_offset 8
+ jmp bar # TAILCALL
+.Ltmp3:
+.Lfunc_end0:
+ .size foo, .Lfunc_end0-foo
+ .cfi_endproc
+ # -- End function
+ .section .debug_abbrev,"", at progbits
+ .byte 1 # Abbreviation Code
+ .byte 17 # DW_TAG_compile_unit
+ .byte 1 # DW_CHILDREN_yes
+ .byte 37 # DW_AT_producer
+ .byte 14 # DW_FORM_strp
+ .byte 19 # DW_AT_language
+ .byte 5 # DW_FORM_data2
+ .byte 3 # DW_AT_name
+ .byte 14 # DW_FORM_strp
+ .byte 16 # DW_AT_stmt_list
+ .byte 23 # DW_FORM_sec_offset
+ .byte 27 # DW_AT_comp_dir
+ .byte 14 # DW_FORM_strp
+ .ascii "\264B" # DW_AT_GNU_pubnames
+ .byte 25 # DW_FORM_flag_present
+ .byte 17 # DW_AT_low_pc
+ .byte 1 # DW_FORM_addr
+ .byte 18 # DW_AT_high_pc
+ .byte 6 # DW_FORM_data4
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 2 # Abbreviation Code
+ .byte 46 # DW_TAG_subprogram
+ .byte 1 # DW_CHILDREN_yes
+ .byte 17 # DW_AT_low_pc
+ .byte 1 # DW_FORM_addr
+ .byte 18 # DW_AT_high_pc
+ .byte 6 # DW_FORM_data4
+ .byte 64 # DW_AT_frame_base
+ .byte 24 # DW_FORM_exprloc
+ .byte 110 # DW_AT_linkage_name
+ .byte 14 # DW_FORM_strp
+ .byte 3 # DW_AT_name
+ .byte 14 # DW_FORM_strp
+ .byte 58 # DW_AT_decl_file
+ .byte 11 # DW_FORM_data1
+ .byte 59 # DW_AT_decl_line
+ .byte 11 # DW_FORM_data1
+ .byte 63 # DW_AT_external
+ .byte 25 # DW_FORM_flag_present
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 3 # Abbreviation Code
+ .byte 52 # DW_TAG_variable
+ .byte 0 # DW_CHILDREN_no
+ .byte 28 # DW_AT_const_value
+ .byte 15 # DW_FORM_udata
+ .byte 3 # DW_AT_name
+ .byte 14 # DW_FORM_strp
+ .byte 58 # DW_AT_decl_file
+ .byte 11 # DW_FORM_data1
+ .byte 59 # DW_AT_decl_line
+ .byte 11 # DW_FORM_data1
+ .byte 73 # DW_AT_type
+ .byte 19 # DW_FORM_ref4
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 4 # Abbreviation Code
+ .byte 36 # DW_TAG_base_type
+ .byte 0 # DW_CHILDREN_no
+ .byte 3 # DW_AT_name
+ .byte 14 # DW_FORM_strp
+ .byte 62 # DW_AT_encoding
+ .byte 11 # DW_FORM_data1
+ .byte 11 # DW_AT_byte_size
+ .byte 11 # DW_FORM_data1
+ .byte 0 # EOM(1)
+ .byte 0 # EOM(2)
+ .byte 0 # EOM(3)
+ .section .debug_info,"", at progbits
+.Lcu_begin0:
+ .long .Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit
+.Ldebug_info_start0:
+ .short 4 # DWARF version number
+ .long .debug_abbrev # Offset Into Abbrev. Section
+ .byte 8 # Address Size (in bytes)
+ .byte 1 # Abbrev [1] 0xb:0x4d DW_TAG_compile_unit
+ .long .Linfo_string0 # DW_AT_producer
+ .short 2 # DW_AT_language
+ .long .Linfo_string1 # DW_AT_name
+ .long .Lline_table_start0 # DW_AT_stmt_list
+ .long .Linfo_string2 # DW_AT_comp_dir
+ # DW_AT_GNU_pubnames
+ .quad .Lfunc_begin0 # DW_AT_low_pc
+ .long .Lfunc_end0-.Lfunc_begin0 # DW_AT_high_pc
+ .byte 2 # Abbrev [2] 0x2a:0x26 DW_TAG_subprogram
+ .quad .Lfunc_begin0 # DW_AT_low_pc
+ .long .Lfunc_end0-.Lfunc_begin0 # DW_AT_high_pc
+ .byte 1 # DW_AT_frame_base
+ .byte 87
+ .long .Linfo_string3 # DW_AT_linkage_name
+ .long .Linfo_string3 # DW_AT_name
+ .byte 1 # DW_AT_decl_file
+ .byte 1 # DW_AT_decl_line
+ # DW_AT_external
+ .byte 3 # Abbrev [3] 0x43:0xc DW_TAG_variable
+ .byte 0 # DW_AT_const_value
+ .long .Linfo_string4 # DW_AT_name
+ .byte 1 # DW_AT_decl_file
+ .byte 1 # DW_AT_decl_line
+ .long 80 # DW_AT_type
+ .byte 0 # End Of Children Mark
+ .byte 4 # Abbrev [4] 0x50:0x7 DW_TAG_base_type
+ .long .Linfo_string5 # DW_AT_name
+ .byte 7 # DW_AT_encoding
+ .byte 4 # DW_AT_byte_size
+ .byte 0 # End Of Children Mark
+.Ldebug_info_end0:
+ .section .debug_str,"MS", at progbits,1
+.Linfo_string0:
+ .asciz "debugify" # string offset=0
+.Linfo_string1:
+ .asciz "<invalid>" # string offset=9
+.Linfo_string2:
+ .asciz "" # string offset=17
+.Linfo_string3:
+ .asciz "foo" # string offset=19
+.Linfo_string4:
+ .asciz "1" # string offset=23
+.Linfo_string5:
+ .asciz "ty32" # string offset=25
+ .section .debug_pubnames,"", at progbits
+ .long .LpubNames_end0-.LpubNames_start0 # Length of Public Names Info
+.LpubNames_start0:
+ .short 2 # DWARF Version
+ .long .Lcu_begin0 # Offset of Compilation Unit Info
+ .long 88 # Compilation Unit Length
+ .long 42 # DIE offset
+ .asciz "foo" # External Name
+ .long 0 # End Mark
+.LpubNames_end0:
+ .section .debug_pubtypes,"", at progbits
+ .long .LpubTypes_end0-.LpubTypes_start0 # Length of Public Types Info
+.LpubTypes_start0:
+ .short 2 # DWARF Version
+ .long .Lcu_begin0 # Offset of Compilation Unit Info
+ .long 88 # Compilation Unit Length
+ .long 80 # DIE offset
+ .asciz "ty32" # External Name
+ .long 0 # End Mark
+.LpubTypes_end0:
+ .section ".note.GNU-stack","", at progbits
+ .addrsig
+ .addrsig_sym bar
+ .section .debug_line,"", at progbits
+.Lline_table_start0:
More information about the llvm-commits
mailing list