diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFAttribute.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFAttribute.h --- a/llvm/include/llvm/DebugInfo/DWARF/DWARFAttribute.h +++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFAttribute.h @@ -39,9 +39,12 @@ return isValid(); } + /// Identify DWARF attributes that may contain a pointer to a location list. + static bool mayHaveLocationList(dwarf::Attribute Attr, dwarf::Form Form); + /// Identifies DWARF attributes that may contain a reference to a /// DWARF expression. - static bool mayHaveLocationDescription(dwarf::Attribute Attr); + static bool mayHaveLocationExpr(dwarf::Attribute Attr); }; } // end namespace llvm diff --git a/llvm/lib/DWARFLinker/DWARFLinker.cpp b/llvm/lib/DWARFLinker/DWARFLinker.cpp --- a/llvm/lib/DWARFLinker/DWARFLinker.cpp +++ b/llvm/lib/DWARFLinker/DWARFLinker.cpp @@ -1029,7 +1029,7 @@ // buffer using cloneExpression(), otherwise copy the data directly. SmallVector Buffer; ArrayRef Bytes = *Val.getAsBlock(); - if (DWARFAttribute::mayHaveLocationDescription(AttrSpec.Attr) && + if (DWARFAttribute::mayHaveLocationExpr(AttrSpec.Attr) && (Val.isFormClass(DWARFFormValue::FC_Block) || Val.isFormClass(DWARFFormValue::FC_Exprloc))) { DWARFUnit &OrigUnit = Unit.getOrigUnit(); diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp --- a/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp +++ b/llvm/lib/DebugInfo/DWARF/DWARFDie.cpp @@ -69,39 +69,38 @@ } } -static void dumpLocation(raw_ostream &OS, const DWARFFormValue &FormValue, - DWARFUnit *U, unsigned Indent, - DIDumpOptions DumpOpts) { +static void dumpLocationList(raw_ostream &OS, const DWARFFormValue &FormValue, + DWARFUnit *U, unsigned Indent, + DIDumpOptions DumpOpts) { DWARFContext &Ctx = U->getContext(); const MCRegisterInfo *MRI = Ctx.getRegisterInfo(); - if (FormValue.isFormClass(DWARFFormValue::FC_Block) || - FormValue.isFormClass(DWARFFormValue::FC_Exprloc)) { - ArrayRef Expr = *FormValue.getAsBlock(); - DataExtractor Data(StringRef((const char *)Expr.data(), Expr.size()), - Ctx.isLittleEndian(), 0); - DWARFExpression(Data, U->getAddressByteSize(), U->getFormParams().Format) - .print(OS, DumpOpts, MRI, U); - return; - } + uint64_t Offset = *FormValue.getAsSectionOffset(); - if (FormValue.isFormClass(DWARFFormValue::FC_SectionOffset)) { - uint64_t Offset = *FormValue.getAsSectionOffset(); - - if (FormValue.getForm() == DW_FORM_loclistx) { - FormValue.dump(OS, DumpOpts); + if (FormValue.getForm() == DW_FORM_loclistx) { + FormValue.dump(OS, DumpOpts); - if (auto LoclistOffset = U->getLoclistOffset(Offset)) - Offset = *LoclistOffset; - else - return; - } - U->getLocationTable().dumpLocationList(&Offset, OS, U->getBaseAddress(), - MRI, Ctx.getDWARFObj(), U, DumpOpts, - Indent); - return; + if (auto LoclistOffset = U->getLoclistOffset(Offset)) + Offset = *LoclistOffset; + else + return; } + U->getLocationTable().dumpLocationList(&Offset, OS, U->getBaseAddress(), MRI, + Ctx.getDWARFObj(), U, DumpOpts, + Indent); + return; +} - FormValue.dump(OS, DumpOpts); +static void dumpLocationExpr(raw_ostream &OS, const DWARFFormValue &FormValue, + DWARFUnit *U, unsigned Indent, + DIDumpOptions DumpOpts) { + DWARFContext &Ctx = U->getContext(); + const MCRegisterInfo *MRI = Ctx.getRegisterInfo(); + ArrayRef Expr = *FormValue.getAsBlock(); + DataExtractor Data(StringRef((const char *)Expr.data(), Expr.size()), + Ctx.isLittleEndian(), 0); + DWARFExpression(Data, U->getAddressByteSize(), U->getFormParams().Format) + .print(OS, DumpOpts, MRI, U); + return; } /// Dump the name encoded in the type tag. @@ -289,9 +288,15 @@ else FormValue.dump(OS, DumpOpts); } - } else if (Form == dwarf::Form::DW_FORM_exprloc || - DWARFAttribute::mayHaveLocationDescription(Attr)) - dumpLocation(OS, FormValue, U, sizeof(BaseIndent) + Indent + 4, DumpOpts); + } else if (DWARFAttribute::mayHaveLocationList(Attr, Form) && + FormValue.isFormClass(DWARFFormValue::FC_SectionOffset)) + dumpLocationList(OS, FormValue, U, sizeof(BaseIndent) + Indent + 4, + DumpOpts); + else if (FormValue.isFormClass(DWARFFormValue::FC_Exprloc) || + (DWARFAttribute::mayHaveLocationExpr(Attr) && + FormValue.isFormClass(DWARFFormValue::FC_Block))) + dumpLocationExpr(OS, FormValue, U, sizeof(BaseIndent) + Indent + 4, + DumpOpts); else FormValue.dump(OS, DumpOpts); @@ -739,7 +744,25 @@ return *this; } -bool DWARFAttribute::mayHaveLocationDescription(dwarf::Attribute Attr) { +bool DWARFAttribute::mayHaveLocationList(dwarf::Attribute Attr, + dwarf::Form Form) { + switch(Attr) { + case DW_AT_location: + case DW_AT_string_length: + case DW_AT_return_addr: + case DW_AT_data_member_location: + case DW_AT_frame_base: + case DW_AT_static_link: + case DW_AT_segment: + case DW_AT_use_location: + case DW_AT_vtable_elem_location: + return true; + default: + return false; + } +} + +bool DWARFAttribute::mayHaveLocationExpr(dwarf::Attribute Attr) { switch (Attr) { // From the DWARF v5 specification. case DW_AT_location: diff --git a/llvm/test/tools/llvm-dwarfdump/ELF/formclass3.s b/llvm/test/tools/llvm-dwarfdump/ELF/formclass3.s --- a/llvm/test/tools/llvm-dwarfdump/ELF/formclass3.s +++ b/llvm/test/tools/llvm-dwarfdump/ELF/formclass3.s @@ -0,0 +1,288 @@ +# Source: +# typedef unsigned char XMLByte; +# static XMLByte arr[0x100000]; +# +# int main() +# { +# arr[0] = 100; +# arr[10000] = 50; +# return arr[0] + arr[50]; +# } +# Compile with: +# clang -O2 -gdwarf-3 -S b.cpp -o b3.s + +# RUN: llvm-mc %s -filetype obj -triple powerpc64le-unknown-unknown -o %t.o +# RUN: llvm-dwarfdump -debug-info %t.o | FileCheck %s -check-prefix=AT-COUNT +# RUN: llvm-dwarfdump -debug-info -name A %t.o | FileCheck %s -check-prefix=AT-BSIZE + +# AT-COUNT: DW_TAG_subrange_type +# AT-COUNT: DW_AT_count (0x00010400) + +# AT-BSIZE: DW_TAG_class_type +# AT-BSIZE: DW_AT_name ("A") +# AT-BSIZE: DW_AT_byte_size (0x00010400) + + .text + .abiversion 2 + .file "b.cpp" + .file 1 "/llvm-project" "b.cpp" + .globl main # -- Begin function main + .p2align 4 + .type main,@function +main: # @main +.Lfunc_begin0: + .loc 1 8 0 # b.cpp:8:0 + .cfi_startproc +.Lfunc_gep0: + addis 2, 12, .TOC.-.Lfunc_gep0@ha + addi 2, 2, .TOC.-.Lfunc_gep0@l +.Lfunc_lep0: + .localentry main, .Lfunc_lep0-.Lfunc_gep0 +# %bb.0: # %entry + .loc 1 9 14 prologue_end # b.cpp:9:14 + addis 4, 2, a@toc@ha + li 5, 100 + .loc 1 10 2 # b.cpp:10:2 + li 3, 100 + .loc 1 9 14 # b.cpp:9:14 + stb 5, a@toc@l(4) + .loc 1 10 2 # b.cpp:10:2 + blr +.Ltmp0: + .long 0 + .quad 0 +.Lfunc_end0: + .size main, .Lfunc_end0-.Lfunc_begin0 + .cfi_endproc + # -- End function + .type a,@object # @a + .section .bss,"aw",@nobits + .globl a +a: + .space 66560 + .size a, 66560 + + .section .debug_abbrev,"",@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 6 # DW_FORM_data4 + .byte 27 # DW_AT_comp_dir + .byte 14 # DW_FORM_strp + .byte 17 # DW_AT_low_pc + .byte 1 # DW_FORM_addr + .byte 18 # DW_AT_high_pc + .byte 1 # DW_FORM_addr + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 2 # Abbreviation Code + .byte 52 # DW_TAG_variable + .byte 0 # DW_CHILDREN_no + .byte 3 # DW_AT_name + .byte 14 # DW_FORM_strp + .byte 73 # DW_AT_type + .byte 19 # DW_FORM_ref4 + .byte 63 # DW_AT_external + .byte 12 # DW_FORM_flag + .byte 58 # DW_AT_decl_file + .byte 11 # DW_FORM_data1 + .byte 59 # DW_AT_decl_line + .byte 11 # DW_FORM_data1 + .byte 2 # DW_AT_location + .byte 10 # DW_FORM_block1 + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 3 # Abbreviation Code + .byte 2 # DW_TAG_class_type + .byte 1 # DW_CHILDREN_yes + .byte 54 # DW_AT_calling_convention + .byte 11 # DW_FORM_data1 + .byte 3 # DW_AT_name + .byte 14 # DW_FORM_strp + .byte 11 # DW_AT_byte_size + .byte 6 # DW_FORM_data4 + .byte 58 # DW_AT_decl_file + .byte 11 # DW_FORM_data1 + .byte 59 # DW_AT_decl_line + .byte 11 # DW_FORM_data1 + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 4 # Abbreviation Code + .byte 13 # DW_TAG_member + .byte 0 # DW_CHILDREN_no + .byte 3 # DW_AT_name + .byte 14 # DW_FORM_strp + .byte 73 # DW_AT_type + .byte 19 # DW_FORM_ref4 + .byte 58 # DW_AT_decl_file + .byte 11 # DW_FORM_data1 + .byte 59 # DW_AT_decl_line + .byte 11 # DW_FORM_data1 + .byte 56 # DW_AT_data_member_location + .byte 11 # DW_FORM_data1 + .byte 50 # DW_AT_accessibility + .byte 11 # DW_FORM_data1 + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 5 # Abbreviation Code + .byte 1 # DW_TAG_array_type + .byte 1 # DW_CHILDREN_yes + .byte 73 # DW_AT_type + .byte 19 # DW_FORM_ref4 + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 6 # Abbreviation Code + .byte 33 # DW_TAG_subrange_type + .byte 0 # DW_CHILDREN_no + .byte 73 # DW_AT_type + .byte 19 # DW_FORM_ref4 + .byte 55 # DW_AT_count + .byte 6 # DW_FORM_data4 + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 7 # 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 8 # Abbreviation Code + .byte 36 # DW_TAG_base_type + .byte 0 # DW_CHILDREN_no + .byte 3 # DW_AT_name + .byte 14 # DW_FORM_strp + .byte 11 # DW_AT_byte_size + .byte 11 # DW_FORM_data1 + .byte 62 # DW_AT_encoding + .byte 11 # DW_FORM_data1 + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 9 # Abbreviation Code + .byte 46 # DW_TAG_subprogram + .byte 0 # DW_CHILDREN_no + .byte 17 # DW_AT_low_pc + .byte 1 # DW_FORM_addr + .byte 18 # DW_AT_high_pc + .byte 1 # DW_FORM_addr + .byte 64 # DW_AT_frame_base + .byte 10 # DW_FORM_block1 + .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 63 # DW_AT_external + .byte 12 # DW_FORM_flag + .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 3 # DWARF version number + .long .debug_abbrev # Offset Into Abbrev. Section + .byte 8 # Address Size (in bytes) + .byte 1 # Abbrev [1] 0xb:0x96 DW_TAG_compile_unit + .long .Linfo_string0 # DW_AT_producer + .short 33 # DW_AT_language + .long .Linfo_string1 # DW_AT_name + .long .Lline_table_start0 # DW_AT_stmt_list + .long .Linfo_string2 # DW_AT_comp_dir + .quad .Lfunc_begin0 # DW_AT_low_pc + .quad .Lfunc_end0 # DW_AT_high_pc + .byte 2 # Abbrev [2] 0x2e:0x16 DW_TAG_variable + .long .Linfo_string3 # DW_AT_name + .long 68 # DW_AT_type + .byte 1 # DW_AT_external + .byte 1 # DW_AT_decl_file + .byte 6 # DW_AT_decl_line + .byte 9 # DW_AT_location + .byte 3 + .quad a + .byte 3 # Abbrev [3] 0x44:0x1a DW_TAG_class_type + .byte 5 # DW_AT_calling_convention + .long .Linfo_string7 # DW_AT_name + .long 66560 # DW_AT_byte_size + .byte 1 # DW_AT_decl_file + .byte 1 # DW_AT_decl_line + .byte 4 # Abbrev [4] 0x50:0xd DW_TAG_member + .long .Linfo_string4 # DW_AT_name + .long 94 # DW_AT_type + .byte 1 # DW_AT_decl_file + .byte 3 # DW_AT_decl_line + .byte 0 # DW_AT_data_member_location + .byte 1 # DW_AT_accessibility + # DW_ACCESS_public + .byte 0 # End Of Children Mark + .byte 5 # Abbrev [5] 0x5e:0xf DW_TAG_array_type + .long 109 # DW_AT_type + .byte 6 # Abbrev [6] 0x63:0x9 DW_TAG_subrange_type + .long 116 # DW_AT_type + .long 66560 # DW_AT_count + .byte 0 # End Of Children Mark + .byte 7 # Abbrev [7] 0x6d:0x7 DW_TAG_base_type + .long .Linfo_string5 # DW_AT_name + .byte 8 # DW_AT_encoding + .byte 1 # DW_AT_byte_size + .byte 8 # Abbrev [8] 0x74:0x7 DW_TAG_base_type + .long .Linfo_string6 # DW_AT_name + .byte 8 # DW_AT_byte_size + .byte 7 # DW_AT_encoding + .byte 9 # Abbrev [9] 0x7b:0x1e DW_TAG_subprogram + .quad .Lfunc_begin0 # DW_AT_low_pc + .quad .Lfunc_end0 # DW_AT_high_pc + .byte 1 # DW_AT_frame_base + .byte 81 + .long .Linfo_string8 # DW_AT_name + .byte 1 # DW_AT_decl_file + .byte 8 # DW_AT_decl_line + .long 153 # DW_AT_type + .byte 1 # DW_AT_external + .byte 7 # Abbrev [7] 0x99:0x7 DW_TAG_base_type + .long .Linfo_string9 # DW_AT_name + .byte 5 # DW_AT_encoding + .byte 4 # DW_AT_byte_size + .byte 0 # End Of Children Mark +.Ldebug_info_end0: + .section .debug_str,"MS",@progbits,1 +.Linfo_string0: + .asciz "XL C/C++ for Linux on Power, (IBM Internal Development Branch), clang version 13.0.0" # string offset=0 +.Linfo_string1: + .asciz "b.cpp" # string offset=85 +.Linfo_string2: + .asciz "/llvm-project" # string offset=91 +.Linfo_string3: + .asciz "a" # string offset=125 +.Linfo_string4: + .asciz "bigarr" # string offset=127 +.Linfo_string5: + .asciz "unsigned char" # string offset=134 +.Linfo_string6: + .asciz "__ARRAY_SIZE_TYPE__" # string offset=148 +.Linfo_string7: + .asciz "A" # string offset=168 +.Linfo_string8: + .asciz "main" # string offset=170 +.Linfo_string9: + .asciz "int" # string offset=175 + .ident "XL C/C++ for Linux on Power, (IBM Internal Development Branch), clang version 13.0.0" + .section ".note.GNU-stack","",@progbits + .addrsig + .section .debug_line,"",@progbits +.Lline_table_start0: