From a60d9604208ed6f01580062d2d8b2d5127b7f8cd Mon Sep 17 00:00:00 2001 From: Daniel Bertalan Date: Sat, 9 Oct 2021 17:47:43 +0200 Subject: [PATCH] LibDebug: Don't create compilation units for embedded resources Our implementation (naively) assumes that there is a one-to-one correspondence between compilation units and line programs, and that their orders are identical. This is not the case for embedded resources, as Clang only creates line programs for it, but not compilation units. This mismatch caused an assertion failure, which made generating backtraces for GUI applications impossible. This commit introduces a hack that skips creating CompilationUnit objects for LinePrograms that come from embedded resources. --- Userland/Libraries/LibDebug/Dwarf/DwarfInfo.cpp | 14 ++++++++++++-- Userland/Libraries/LibDebug/Dwarf/LineProgram.h | 11 ++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Userland/Libraries/LibDebug/Dwarf/DwarfInfo.cpp b/Userland/Libraries/LibDebug/Dwarf/DwarfInfo.cpp index 2a2c3bbd83..cdfb2b5c17 100644 --- a/Userland/Libraries/LibDebug/Dwarf/DwarfInfo.cpp +++ b/Userland/Libraries/LibDebug/Dwarf/DwarfInfo.cpp @@ -57,8 +57,18 @@ void DwarfInfo::populate_compilation_units() auto line_program = make(*this, line_info_stream); - m_compilation_units.append(make(*this, unit_offset, compilation_unit_header, move(line_program))); - debug_info_stream.discard_or_error(length_after_header); + // HACK: Clang generates line programs for embedded resource assembly files, but not compile units. + // Meaning that for graphical applications, some line info data would be unread, triggering the assertion below. + // As a fix, we don't create compilation units for line programs that come from resource files. +#ifdef __clang__ + if (line_program->source_files().size() == 1 && line_program->source_files()[0].name.view().contains("serenity_icon_"sv)) { + debug_info_stream.seek(unit_offset); + } else +#endif + { + m_compilation_units.append(make(*this, unit_offset, compilation_unit_header, move(line_program))); + debug_info_stream.discard_or_error(length_after_header); + } } VERIFY(line_info_stream.eof()); diff --git a/Userland/Libraries/LibDebug/Dwarf/LineProgram.h b/Userland/Libraries/LibDebug/Dwarf/LineProgram.h index ed6f01bd08..b90b10d948 100644 --- a/Userland/Libraries/LibDebug/Dwarf/LineProgram.h +++ b/Userland/Libraries/LibDebug/Dwarf/LineProgram.h @@ -122,6 +122,12 @@ public: }; DirectoryAndFile get_directory_and_file(size_t file_index) const; + struct FileEntry { + FlyString name; + size_t directory_index { 0 }; + }; + Vector const& source_files() const { return m_source_files; } + private: void parse_unit_header(); void parse_source_directories(); @@ -159,11 +165,6 @@ private: SetDiscriminator, }; - struct FileEntry { - FlyString name; - size_t directory_index { 0 }; - }; - static constexpr u16 MIN_DWARF_VERSION = 3; static constexpr u16 MAX_DWARF_VERSION = 5;