Author: Adrian Prantl Date: 2023-06-14T08:37:08-07:00 New Revision: 27fac4a72ae54a471471a69c0ad999585ccbb026
URL: https://github.com/llvm/llvm-project/commit/27fac4a72ae54a471471a69c0ad999585ccbb026 DIFF: https://github.com/llvm/llvm-project/commit/27fac4a72ae54a471471a69c0ad999585ccbb026.diff LOG: Add support for __debug_line_str in Mach-O This patch resolves an issue that currently accounts for the vast majority of failures on the matrix bot. Differential Revision: https://reviews.llvm.org/D152872 Added: lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-macho.c Modified: lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 887c0b64c2c62..5fddb4e6eadd0 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -1443,6 +1443,7 @@ static lldb::SectionType GetSectionType(uint32_t flags, static ConstString g_sect_name_dwarf_debug_frame("__debug_frame"); static ConstString g_sect_name_dwarf_debug_info("__debug_info"); static ConstString g_sect_name_dwarf_debug_line("__debug_line"); + static ConstString g_sect_name_dwarf_debug_line_str("__debug_line_str"); static ConstString g_sect_name_dwarf_debug_loc("__debug_loc"); static ConstString g_sect_name_dwarf_debug_loclists("__debug_loclists"); static ConstString g_sect_name_dwarf_debug_macinfo("__debug_macinfo"); @@ -1472,6 +1473,8 @@ static lldb::SectionType GetSectionType(uint32_t flags, return eSectionTypeDWARFDebugInfo; if (section_name == g_sect_name_dwarf_debug_line) return eSectionTypeDWARFDebugLine; + if (section_name == g_sect_name_dwarf_debug_line_str) + return eSectionTypeDWARFDebugLineStr; if (section_name == g_sect_name_dwarf_debug_loc) return eSectionTypeDWARFDebugLoc; if (section_name == g_sect_name_dwarf_debug_loclists) diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-macho.c b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-macho.c new file mode 100644 index 0000000000000..cc7305677f6e7 --- /dev/null +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-macho.c @@ -0,0 +1,15 @@ +// Test that the file names in the __debug_line_str section can be decoded. + +// REQUIRES: system-darwin + +// RUN: %clang -target x86_64-apple-darwin %s -c -o %t.o -gdwarf-5 +// RUN: llvm-readobj --sections %t.o | FileCheck %s --check-prefix NAMES +// RUN: xcrun %clang -target x86_64-apple-darwin -o %t.exe %t.o +// RUN: %lldb %t.exe -b -o "target modules dump line-table %s" | FileCheck %s + +// NAMES: Name: __debug_line_str + +int main(int argc, char **argv) { + // CHECK: dwarf5-macho.c:[[@LINE+1]] + return 0; +} _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
