Index: llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h =================================================================== --- llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h +++ llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h @@ -316,6 +316,10 @@ getLineTableForUnit(DWARFUnit *U, function_ref RecoverableErrorHandler); + DWARFDataExtractor getStringOffsetsExtractor() const { + return DWARFDataExtractor(*DObj, DObj->getStrOffsetsSection(), + isLittleEndian(), 0); + } DataExtractor getStringExtractor() const { return DataExtractor(DObj->getStrSection(), false, 0); } Index: llvm/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h =================================================================== --- llvm/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h +++ llvm/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h @@ -9,6 +9,7 @@ #ifndef LLVM_DEBUGINFO_DWARF_DWARFDEBUGMACRO_H #define LLVM_DEBUGINFO_DWARF_DWARFDEBUGMACRO_H +#include "llvm//DebugInfo/DWARF/DWARFUnit.h" #include "llvm/ADT/SmallVector.h" #include "llvm/DebugInfo/DWARF/DWARFDataExtractor.h" #include "llvm/Support/Errc.h" @@ -103,7 +104,9 @@ /// Parse the debug_macinfo/debug_macro section accessible via the 'Data' /// parameter. - Error parse(DataExtractor StringExtractor, DWARFDataExtractor Data, + Error parse(Optional Units, + Optional StringOffsetsExtractor, + Optional StringExtractor, DWARFDataExtractor Data, bool IsMacro); /// Return whether the section has any entries. Index: llvm/lib/DebugInfo/DWARF/DWARFContext.cpp =================================================================== --- llvm/lib/DebugInfo/DWARF/DWARFContext.cpp +++ llvm/lib/DebugInfo/DWARF/DWARFContext.cpp @@ -296,7 +296,17 @@ DWARFContext::parseMacroOrMacinfo(MacroSecType SectionType) { auto Macro = std::make_unique(); auto ParseAndDump = [&](DWARFDataExtractor &Data, bool IsMacro) { - if (Error Err = Macro->parse(getStringExtractor(), Data, IsMacro)) { + Optional StrOffsetsExtractor; + Optional StrExtractor; + Optional Units; + if (IsMacro) { + StrOffsetsExtractor = getStringOffsetsExtractor(); + StrExtractor = getStringExtractor(); + // FIXME: Add support for debug_macro.dwo section. + Units = normal_units(); + } + if (Error Err = Macro->parse(Units, StrOffsetsExtractor, StrExtractor, Data, + IsMacro)) { RecoverableErrorHandler(std::move(Err)); Macro = nullptr; } Index: llvm/lib/DebugInfo/DWARF/DWARFDebugMacro.cpp =================================================================== --- llvm/lib/DebugInfo/DWARF/DWARFDebugMacro.cpp +++ llvm/lib/DebugInfo/DWARF/DWARFDebugMacro.cpp @@ -62,6 +62,8 @@ case DW_MACRO_undef: case DW_MACRO_define_strp: case DW_MACRO_undef_strp: + case DW_MACRO_define_strx: + case DW_MACRO_undef_strx: OS << " - lineno: " << E.Line; OS << " macro: " << E.MacroStr; break; @@ -84,10 +86,25 @@ } } -Error DWARFDebugMacro::parse(DataExtractor StringExtractor, - DWARFDataExtractor Data, bool IsMacro) { +Error DWARFDebugMacro::parse( + Optional Units, + Optional StringOffsetsExtractor, + Optional StringExtractor, DWARFDataExtractor Data, + bool IsMacro) { uint64_t Offset = 0; MacroList *M = nullptr; + using MacroToSrOffetsMap = DenseMap>; + MacroToSrOffetsMap MacroToSrOffets; + if (IsMacro && Data.isValidOffset(Offset)) { + // Keep a mapping from Macro contribution to StrOffsets contribution, + // this will be needed while retrieving macro from DW_MACRO_define_strx + // form. + for (const auto &U : Units.getValue()) + if (auto CUDIE = U->getUnitDIE()) + MacroToSrOffets.insert( + {*toSectionOffset(CUDIE.find(DW_AT_macros)), + toSectionOffset(CUDIE.find(DW_AT_str_offsets_base))}); + } while (Data.isValidOffset(Offset)) { if (!M) { MacroLists.emplace_back(); @@ -99,6 +116,10 @@ return Err; } } + auto GetStrOffsetBase = [&]() { + const auto StrOffsetsBase = MacroToSrOffets.find(M->Offset); + return StrOffsetsBase->second.getValue(); + }; // A macro list entry consists of: M->Macros.emplace_back(); Entry &E = M->Macros.back(); @@ -110,7 +131,6 @@ M = nullptr; continue; } - switch (E.Type) { default: // Got a corrupted ".debug_macinfo" section (invalid macinfo type). @@ -138,7 +158,18 @@ // 3. Macro string // FIXME: Add support for DWARF64 StrOffset = Data.getRelocatedValue(/*OffsetSize=*/4, &Offset); - E.MacroStr = StringExtractor.getCStr(&StrOffset); + E.MacroStr = StringExtractor.getValue().getCStr(&StrOffset); + break; + } + case DW_MACRO_define_strx: + case DW_MACRO_undef_strx: { + uint64_t StrOffsetBase = GetStrOffsetBase(); + E.Line = Data.getULEB128(&Offset); + uint64_t OffsetIndex = Data.getULEB128(&Offset); + uint64_t IndexOffset = StrOffsetBase + OffsetIndex * /*EntrySize=*/4; + uint64_t StrOffset = StringOffsetsExtractor.getValue().getRelocatedValue( + /*OffsetSize=*/4, &IndexOffset); + E.MacroStr = StringExtractor.getValue().getCStr(&StrOffset); break; } case DW_MACRO_start_file: Index: llvm/test/DebugInfo/X86/debug-macro-multi-cu-strx.s =================================================================== --- /dev/null +++ llvm/test/DebugInfo/X86/debug-macro-multi-cu-strx.s @@ -0,0 +1,149 @@ +## This test checks that llvm-dwarfdump can dump debug_macro +## section containing contributions from multiple CU's represented +## using DW_MACRO_define_strx form. + +# RUN: llvm-mc -triple x86_64-unknown-linux -filetype=obj %s -o -| \ +# RUN: llvm-dwarfdump -debug-macro - | FileCheck -strict-whitespace -match-full-lines %s + +# CHECK:.debug_macro contents: +# CHECK-NEXT:0x00000000: +# CHECK-NEXT:macro header: version = 0x0005, flags = 0x02, debug_line_offset = 0x0000 +# CHECK-NEXT:DW_MACRO_start_file - lineno: 0 filenum: 0 +# CHECK-NEXT: DW_MACRO_define_strx - lineno: 1 macro: DWARF_VERSION 5 +# CHECK-NEXT: DW_MACRO_define_strx - lineno: 2 macro: COMPILE_UNIT 1 +# CHECK-NEXT: DW_MACRO_undef_strx - lineno: 3 macro: COMPILE_UNIT +# CHECK-NEXT:DW_MACRO_end_file + +# CHECK:0x00000015: +# CHECK-NEXT:macro header: version = 0x0005, flags = 0x02, debug_line_offset = 0x0000 +# CHECK-NEXT:DW_MACRO_start_file - lineno: 1 filenum: 3 +# CHECK-NEXT: DW_MACRO_define_strx - lineno: 2 macro: COMPILE_UNIT 2 +# CHECK-NEXT: DW_MACRO_undef_strx - lineno: 3 macro: COMPILE_UNIT +# CHECK-NEXT:DW_MACRO_end_file + + .section .debug_abbrev,"",@progbits + .byte 1 # Abbreviation Code + .byte 17 # DW_TAG_compile_unit + .byte 0 # DW_CHILDREN_no + .byte 114 # DW_AT_str_offsets_base + .byte 23 # DW_FORM_sec_offset + .byte 16 # DW_AT_stmt_list + .byte 23 # DW_FORM_sec_offset + .byte 27 # DW_AT_comp_dir + .byte 37 # DW_FORM_strx1 + .byte 121 # DW_AT_macros + .byte 23 # DW_FORM_sec_offset + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 0 # EOM(3) + .section .debug_info,"",@progbits +.Lcu_begin0: + .long .Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit +.Ldebug_info_start0: + .short 5 # DWARF version number + .byte 1 # DWARF Unit Type + .byte 8 # Address Size (in bytes) + .long .debug_abbrev # Offset Into Abbrev. Section + .byte 1 # Abbrev [1] 0xc:0x12 DW_TAG_compile_unit + .long .Lstr_offsets_base0 # DW_AT_str_offsets_base + .long .Lline_table_start0 # DW_AT_stmt_list + .byte 2 # DW_AT_comp_dir + .long .Lcu_macro_begin0 # DW_AT_macros +.Ldebug_info_end0: + .section .debug_macro,"",@progbits +.Lcu_macro_begin0: + .short 5 # Macro information version + .byte 2 # Flags: 32 bit, debug_line_offset present + .long .Lline_table_start0 # debug_line_offset + .byte 3 # DW_MACRO_start_file + .byte 0 # Line Number + .byte 0 # File Number + .byte 11 # DW_MACRO_define_strx + .byte 1 # Line Number + .byte 0 # Macro String + .byte 11 # DW_MACRO_define_strx + .byte 2 # Line Number + .byte 1 # Macro String + .byte 12 # DW_MACRO_undef_strx + .byte 3 # Line Number + .byte 2 # Macro String + .byte 4 # DW_MACRO_end_file + .byte 0 # End Of Macro List Mark + .section .debug_str_offsets,"",@progbits + .long 12 + .short 5 + .short 0 +.Lstr_offsets_base0: + .section .debug_str,"MS",@progbits,1 +.Linfo_string0: + .asciz "DWARF_VERSION 5" +.Linfo_string1: + .asciz "COMPILE_UNIT 1" +.Linfo_string2: + .asciz "COMPILE_UNIT" + .section .debug_str_offsets,"",@progbits + .long .Linfo_string0 + .long .Linfo_string1 + .long .Linfo_string2 + .section .debug_line,"",@progbits +.Lline_table_start0: + .text + .file "cu2.c" + .section .debug_abbrev,"",@progbits + .byte 1 # Abbreviation Code + .byte 17 # DW_TAG_compile_unit + .byte 0 # DW_CHILDREN_no + .byte 114 # DW_AT_str_offsets_base + .byte 23 # DW_FORM_sec_offset + .byte 16 # DW_AT_stmt_list + .byte 23 # DW_FORM_sec_offset + .byte 27 # DW_AT_comp_dir + .byte 37 # DW_FORM_strx1 + .byte 121 # DW_AT_macros + .byte 23 # DW_FORM_sec_offset + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 0 # EOM(3) + .section .debug_info,"",@progbits +.Lcu_begin1: + .long .Ldebug_info_end1-.Ldebug_info_start1 # Length of Unit +.Ldebug_info_start1: + .short 5 # DWARF version number + .byte 1 # DWARF Unit Type + .byte 8 # Address Size (in bytes) + .long .debug_abbrev # Offset Into Abbrev. Section + .byte 1 # Abbrev [1] 0xc:0x12 DW_TAG_compile_unit + .long .Lstr_offsets_base1 # DW_AT_str_offsets_base + .long .Lline_table_start1 # DW_AT_stmt_list + .byte 2 # DW_AT_comp_dir + .long .Lcu_macro_begin1 # DW_AT_macros +.Ldebug_info_end1: + .section .debug_macro,"",@progbits +.Lcu_macro_begin1: + .short 5 # Macro information version + .byte 2 # Flags: 32 bit, debug_line_offset present + .long .Lline_table_start1 # debug_line_offset + .byte 3 # DW_MACRO_start_file + .byte 1 # Line Number + .byte 3 # File Number + .byte 11 # DW_MACRO_define_strx + .byte 2 # Line Number + .byte 0 # Macro String + .byte 12 # DW_MACRO_undef_strx + .byte 3 # Line Number + .byte 1 # Macro String + .byte 4 # DW_MACRO_end_file + .section .debug_str_offsets,"",@progbits + .long 12 + .short 5 + .short 0 +.Lstr_offsets_base1: + .section .debug_str,"MS",@progbits,1 +.Linfo_string3: + .asciz "COMPILE_UNIT 2" +.Linfo_string4: + .asciz "COMPILE_UNIT" + .section .debug_str_offsets,"",@progbits + .long .Linfo_string3 + .long .Linfo_string4 +.Lline_table_start1: