diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp --- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp @@ -1618,9 +1618,17 @@ addUInt(*MemLocationDie, dwarf::DW_FORM_data1, dwarf::DW_OP_plus_uconst); addUInt(*MemLocationDie, dwarf::DW_FORM_udata, OffsetInBytes); addBlock(MemberDie, dwarf::DW_AT_data_member_location, MemLocationDie); - } else if (!IsBitfield || DD->useDWARF2Bitfields()) - addUInt(MemberDie, dwarf::DW_AT_data_member_location, None, - OffsetInBytes); + } else if (!IsBitfield || DD->useDWARF2Bitfields()) { + // In DWARF3, DW_FORM_data4/8 in DW_AT_data_member_location will always be + // interpreted as location-list pointers. So we use DW_FORM_udata to + // encode the constants here. + if (DD->getDwarfVersion() == 3) + addUInt(MemberDie, dwarf::DW_AT_data_member_location, + dwarf::DW_FORM_udata, OffsetInBytes); + else + addUInt(MemberDie, dwarf::DW_AT_data_member_location, None, + OffsetInBytes); + } } if (DT->isProtected()) diff --git a/llvm/test/tools/llvm-dwarfdump/ELF/formclass3-atmemloc.s b/llvm/test/tools/llvm-dwarfdump/ELF/formclass3-atmemloc.s --- a/llvm/test/tools/llvm-dwarfdump/ELF/formclass3-atmemloc.s +++ b/llvm/test/tools/llvm-dwarfdump/ELF/formclass3-atmemloc.s @@ -0,0 +1,340 @@ +# Source: +# struct e { +# char f[16384]; +# char g; +# }; +# e foo() { +# auto E = new e; +# return *E; +# } +# Compile with: +# clang -O2 -gdwarf-3 -S a.cpp -o a3.s + +# RUN: llvm-mc %s -filetype obj -triple powerpc64le-unknown-unknown -o %t.o +# RUN: llvm-dwarfdump -debug-info -name g %t.o | FileCheck %s -check-prefix=AT-MEMLOC + +# AT-MEMLOC: DW_TAG_member +# AT-MEMLOC: DW_AT_name ("g") +# AT-MEMLOC: DW_AT_data_member_location (65536) + + .text + .abiversion 2 + .file "a.cpp" + .file 1 "/llvm-project" "a.cpp" + .globl _Z3foov # -- Begin function _Z3foov + .p2align 4 + .type _Z3foov,@function +_Z3foov: # @_Z3foov +.Lfunc_begin0: + .loc 1 5 0 # a.cpp:5:0 + .cfi_startproc +.Lfunc_gep0: + addis 2, 12, .TOC.-.Lfunc_gep0@ha + addi 2, 2, .TOC.-.Lfunc_gep0@l +.Lfunc_lep0: + .localentry _Z3foov, .Lfunc_lep0-.Lfunc_gep0 +# %bb.0: # %entry + mflr 0 + .cfi_def_cfa_offset 64 + .cfi_offset lr, 16 + .cfi_offset r29, -24 + .cfi_offset r30, -16 + std 29, -24(1) # 8-byte Folded Spill + std 30, -16(1) # 8-byte Folded Spill + std 0, 16(1) + stdu 1, -64(1) + mr 30, 3 + lis 3, 1 + ori 29, 3, 4 +.Ltmp0: + .loc 1 6 12 prologue_end # a.cpp:6:12 + mr 3, 29 + bl _Znwm + nop + mr 4, 3 +.Ltmp1: + #DEBUG_VALUE: foo:E <- $x4 + .loc 1 7 10 # a.cpp:7:10 + mr 3, 30 + mr 5, 29 + bl memcpy + nop +.Ltmp2: + .loc 1 8 1 # a.cpp:8:1 + addi 1, 1, 64 + ld 0, 16(1) + ld 30, -16(1) # 8-byte Folded Reload + ld 29, -24(1) # 8-byte Folded Reload + mtlr 0 + blr +.Ltmp3: + .long 0 + .quad 0 +.Lfunc_end0: + .size _Z3foov, .Lfunc_end0-.Lfunc_begin0 + .cfi_endproc + # -- End function + .section .debug_loc,"",@progbits +.Ldebug_loc0: + .quad .Ltmp1-.Lfunc_begin0 + .quad .Ltmp2-.Lfunc_begin0 + .short 1 # Loc expr size + .byte 84 # DW_OP_reg4 + .quad 0 + .quad 0 + .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 19 # DW_TAG_structure_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 3 # 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 15 # DW_FORM_udata + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 4 # Abbreviation Code + .byte 4 # DW_TAG_enumeration_type + .byte 0 # DW_CHILDREN_no + .byte 73 # DW_AT_type + .byte 19 # DW_FORM_ref4 + .byte 11 # DW_AT_byte_size + .byte 11 # DW_FORM_data1 + .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 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 5 # DW_FORM_data2 + .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 1 # DW_CHILDREN_yes + .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 + .ascii "\207@" # DW_AT_MIPS_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 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 10 # Abbreviation Code + .byte 52 # DW_TAG_variable + .byte 0 # DW_CHILDREN_no + .byte 2 # DW_AT_location + .byte 6 # DW_FORM_data4 + .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 11 # Abbreviation Code + .byte 15 # DW_TAG_pointer_type + .byte 0 # DW_CHILDREN_no + .byte 73 # DW_AT_type + .byte 19 # DW_FORM_ref4 + .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:0xac 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:0x2f DW_TAG_structure_type + .byte 5 # DW_AT_calling_convention + .long .Linfo_string8 # DW_AT_name + .long 65540 # DW_AT_byte_size + .byte 1 # DW_AT_decl_file + .byte 1 # DW_AT_decl_line + .byte 3 # Abbrev [3] 0x3a:0xc DW_TAG_member + .long .Linfo_string3 # DW_AT_name + .long 93 # DW_AT_type + .byte 1 # DW_AT_decl_file + .byte 2 # DW_AT_decl_line + .byte 0 # DW_AT_data_member_location + .byte 4 # Abbrev [4] 0x46:0x8 DW_TAG_enumeration_type + .long 106 # DW_AT_type + .byte 4 # DW_AT_byte_size + .byte 1 # DW_AT_decl_file + .byte 2 # DW_AT_decl_line + .byte 3 # Abbrev [3] 0x4e:0xe DW_TAG_member + .long .Linfo_string6 # DW_AT_name + .long 120 # DW_AT_type + .byte 1 # DW_AT_decl_file + .byte 3 # DW_AT_decl_line + .ascii "\200\200\004" # DW_AT_data_member_location + .byte 0 # End Of Children Mark + .byte 5 # Abbrev [5] 0x5d:0xd DW_TAG_array_type + .long 70 # DW_AT_type + .byte 6 # Abbrev [6] 0x62:0x7 DW_TAG_subrange_type + .long 113 # DW_AT_type + .short 16384 # DW_AT_count + .byte 0 # End Of Children Mark + .byte 7 # Abbrev [7] 0x6a:0x7 DW_TAG_base_type + .long .Linfo_string4 # DW_AT_name + .byte 7 # DW_AT_encoding + .byte 4 # DW_AT_byte_size + .byte 8 # Abbrev [8] 0x71:0x7 DW_TAG_base_type + .long .Linfo_string5 # DW_AT_name + .byte 8 # DW_AT_byte_size + .byte 7 # DW_AT_encoding + .byte 7 # Abbrev [7] 0x78:0x7 DW_TAG_base_type + .long .Linfo_string7 # DW_AT_name + .byte 5 # DW_AT_encoding + .byte 2 # DW_AT_byte_size + .byte 9 # Abbrev [9] 0x7f:0x32 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_string9 # DW_AT_MIPS_linkage_name + .long .Linfo_string10 # DW_AT_name + .byte 1 # DW_AT_decl_file + .byte 5 # DW_AT_decl_line + .long 46 # DW_AT_type + .byte 1 # DW_AT_external + .byte 10 # Abbrev [10] 0xa1:0xf DW_TAG_variable + .long .Ldebug_loc0 # DW_AT_location + .long .Linfo_string11 # DW_AT_name + .byte 1 # DW_AT_decl_file + .byte 6 # DW_AT_decl_line + .long 177 # DW_AT_type + .byte 0 # End Of Children Mark + .byte 11 # Abbrev [11] 0xb1:0x5 DW_TAG_pointer_type + .long 46 # DW_AT_type + .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 "a.cpp" # string offset=85 +.Linfo_string2: + .asciz "/llvm-project" # string offset=91 +.Linfo_string3: + .asciz "f" # string offset=125 +.Linfo_string4: + .asciz "unsigned int" # string offset=127 +.Linfo_string5: + .asciz "__ARRAY_SIZE_TYPE__" # string offset=140 +.Linfo_string6: + .asciz "g" # string offset=160 +.Linfo_string7: + .asciz "short" # string offset=162 +.Linfo_string8: + .asciz "e" # string offset=168 +.Linfo_string9: + .asciz "_Z3foov" # string offset=170 +.Linfo_string10: + .asciz "foo" # string offset=178 +.Linfo_string11: + .asciz "E" # string offset=182 + .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: