From fcd7717ddf077dc67ca1022f989145dda186e5ef Mon Sep 17 00:00:00 2001 From: Alexander Yermolovich Date: Wed, 19 Oct 2022 10:44:09 -0700 Subject: [PATCH] [BOLT][DWARF] Add support for DW_FORM_addr for DW_AT_call_return_pc GCC 12 produces DW_FORM_addr for DW_AT_call_return_pc. Added support for that. Fixes facebookincubator/BOLT#307 Reviewed By: maksfb Differential Revision: https://reviews.llvm.org/D136204 --- bolt/lib/Rewrite/DWARFRewriter.cpp | 24 +- .../X86/Inputs/dwarf5-return-pc-form-addr-main.s | 547 +++++++++++++++++++++ bolt/test/X86/dwarf5-return-pc-form-addr.test | 29 ++ 3 files changed, 588 insertions(+), 12 deletions(-) create mode 100644 bolt/test/X86/Inputs/dwarf5-return-pc-form-addr-main.s create mode 100644 bolt/test/X86/dwarf5-return-pc-form-addr.test diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp index 3c16592..94844ce 100644 --- a/bolt/lib/Rewrite/DWARFRewriter.cpp +++ b/bolt/lib/Rewrite/DWARFRewriter.cpp @@ -498,20 +498,20 @@ void DWARFRewriter::updateUnitDebugInfo( Optional Address = AttrVal.V.getAsAddress(); const BinaryFunction *Function = BC.getBinaryFunctionContainingAddress(*Address); - uint32_t Index = 0; - // Preserving original address instead of using whatever ends up at this - // index. - if (!Function) { - Index = AddrWriter->getIndexFromAddress(*Address, Unit); - } else { - const uint64_t UpdatedAddress = - Function->translateInputToOutputAddress(*Address); - Index = AddrWriter->getIndexFromAddress(UpdatedAddress, Unit); - } - if (AttrVal.V.getForm() == dwarf::DW_FORM_addrx) + uint64_t UpdatedAddress = *Address; + if (Function) + UpdatedAddress = + Function->translateInputToOutputAddress(UpdatedAddress); + + if (AttrVal.V.getForm() == dwarf::DW_FORM_addrx) { + const uint32_t Index = + AddrWriter->getIndexFromAddress(UpdatedAddress, Unit); DebugInfoPatcher.addUDataPatch(AttrVal.Offset, Index, AttrVal.Size); - else + } else if (AttrVal.V.getForm() == dwarf::DW_FORM_addr) { + DebugInfoPatcher.addLE32Patch(AttrVal.Offset, UpdatedAddress); + } else { errs() << "BOLT-ERROR: unsupported form for " << Entry << "\n"; + } }; if (Optional AttrVal = diff --git a/bolt/test/X86/Inputs/dwarf5-return-pc-form-addr-main.s b/bolt/test/X86/Inputs/dwarf5-return-pc-form-addr-main.s new file mode 100644 index 0000000..eae6404 --- /dev/null +++ b/bolt/test/X86/Inputs/dwarf5-return-pc-form-addr-main.s @@ -0,0 +1,547 @@ +# -gdwarf-5 -g2 -O2 -S +# int fooVar0; +# void use() { +# ++fooVar0; +# } +# +# extern int foo0(int); +# int main(int argc, char *argv[]) { +# if ( argc == 5) { +# int x = argc; +# use(); +# return x + foo0(x); +# } +# return 0; +# } + +# Manually modified to use DW_FORM_addr for DW_AT_call_return_pc. + + .text + .file "main.cpp" + .file 0 "." "main.cpp" md5 0x02a00a8be50e50d669847461ae3d9851 + .globl _Z3usev # -- Begin function _Z3usev + .p2align 4, 0x90 + .type _Z3usev,@function +_Z3usev: # @_Z3usev +.Lfunc_begin0: + .loc 0 2 0 # main.cpp:2:0 + .cfi_startproc +# %bb.0: # %entry + .loc 0 3 3 prologue_end # main.cpp:3:3 + incl fooVar0(%rip) + .loc 0 4 1 # main.cpp:4:1 + retq +.Ltmp0: +.Lfunc_end0: + .size _Z3usev, .Lfunc_end0-_Z3usev + .cfi_endproc + # -- End function + .globl main # -- Begin function main + .p2align 4, 0x90 + .type main,@function +main: # @main +.Lfunc_begin1: + .loc 0 7 0 # main.cpp:7:0 + .cfi_startproc +# %bb.0: # %entry + #DEBUG_VALUE: main:argc <- $edi + #DEBUG_VALUE: main:argv <- $rsi + xorl %eax, %eax +.Ltmp1: + .loc 0 8 14 prologue_end # main.cpp:8:14 + cmpl $5, %edi +.Ltmp2: + .loc 0 8 9 is_stmt 0 # main.cpp:8:9 + jne .LBB1_2 +.Ltmp3: +# %bb.1: # %if.then + #DEBUG_VALUE: main:argc <- $edi + #DEBUG_VALUE: main:argv <- $rsi + pushq %rax + .cfi_def_cfa_offset 16 +.Ltmp4: + #DEBUG_VALUE: x <- $edi + .loc 0 3 3 is_stmt 1 # main.cpp:3:3 + incl fooVar0(%rip) +.Ltmp5: + .loc 0 11 16 # main.cpp:11:16 + movl $5, %edi +.Ltmp6: + #DEBUG_VALUE: main:argc <- [DW_OP_LLVM_entry_value 1] $edi + callq _Z4foo0i +.Ltmp7: + #DEBUG_VALUE: main:argv <- [DW_OP_LLVM_entry_value 1] $rsi + .loc 0 11 14 is_stmt 0 # main.cpp:11:14 + addl $5, %eax + addq $8, %rsp +.Ltmp8: + .cfi_def_cfa_offset 8 +.LBB1_2: # %return + #DEBUG_VALUE: main:argc <- [DW_OP_LLVM_entry_value 1] $edi + #DEBUG_VALUE: main:argv <- [DW_OP_LLVM_entry_value 1] $rsi + .loc 0 14 1 is_stmt 1 # main.cpp:14:1 + retq +.Ltmp9: +.Lfunc_end1: + .size main, .Lfunc_end1-main + .cfi_endproc + # -- End function + .type fooVar0,@object # @fooVar0 + .bss + .globl fooVar0 + .p2align 2 +fooVar0: + .long 0 # 0x0 + .size fooVar0, 4 + + .section .debug_loclists,"",@progbits + .long .Ldebug_list_header_end0-.Ldebug_list_header_start0 # Length +.Ldebug_list_header_start0: + .short 5 # Version + .byte 8 # Address size + .byte 0 # Segment selector size + .long 3 # Offset entry count +.Lloclists_table_base0: + .long .Ldebug_loc0-.Lloclists_table_base0 + .long .Ldebug_loc1-.Lloclists_table_base0 + .long .Ldebug_loc2-.Lloclists_table_base0 +.Ldebug_loc0: + .byte 4 # DW_LLE_offset_pair + .uleb128 .Lfunc_begin1-.Lfunc_begin0 # starting offset + .uleb128 .Ltmp6-.Lfunc_begin0 # ending offset + .byte 1 # Loc expr size + .byte 85 # super-register DW_OP_reg5 + .byte 4 # DW_LLE_offset_pair + .uleb128 .Ltmp6-.Lfunc_begin0 # starting offset + .uleb128 .Lfunc_end1-.Lfunc_begin0 # ending offset + .byte 4 # Loc expr size + .byte 163 # DW_OP_entry_value + .byte 1 # 1 + .byte 85 # super-register DW_OP_reg5 + .byte 159 # DW_OP_stack_value + .byte 0 # DW_LLE_end_of_list +.Ldebug_loc1: + .byte 4 # DW_LLE_offset_pair + .uleb128 .Lfunc_begin1-.Lfunc_begin0 # starting offset + .uleb128 .Ltmp7-.Lfunc_begin0 # ending offset + .byte 1 # Loc expr size + .byte 84 # DW_OP_reg4 + .byte 4 # DW_LLE_offset_pair + .uleb128 .Ltmp7-.Lfunc_begin0 # starting offset + .uleb128 .Lfunc_end1-.Lfunc_begin0 # ending offset + .byte 4 # Loc expr size + .byte 163 # DW_OP_entry_value + .byte 1 # 1 + .byte 84 # DW_OP_reg4 + .byte 159 # DW_OP_stack_value + .byte 0 # DW_LLE_end_of_list +.Ldebug_loc2: + .byte 4 # DW_LLE_offset_pair + .uleb128 .Ltmp4-.Lfunc_begin0 # starting offset + .uleb128 .Ltmp6-.Lfunc_begin0 # ending offset + .byte 1 # Loc expr size + .byte 85 # super-register DW_OP_reg5 + .byte 0 # DW_LLE_end_of_list +.Ldebug_list_header_end0: + .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 37 # DW_FORM_strx1 + .byte 19 # DW_AT_language + .byte 5 # DW_FORM_data2 + .byte 3 # DW_AT_name + .byte 37 # DW_FORM_strx1 + .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 17 # DW_AT_low_pc + .byte 27 # DW_FORM_addrx + .byte 18 # DW_AT_high_pc + .byte 6 # DW_FORM_data4 + .byte 115 # DW_AT_addr_base + .byte 23 # DW_FORM_sec_offset + .ascii "\214\001" # DW_AT_loclists_base + .byte 23 # DW_FORM_sec_offset + .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 37 # DW_FORM_strx1 + .byte 73 # DW_AT_type + .byte 19 # DW_FORM_ref4 + .byte 63 # DW_AT_external + .byte 25 # DW_FORM_flag_present + .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 24 # DW_FORM_exprloc + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 3 # Abbreviation Code + .byte 36 # DW_TAG_base_type + .byte 0 # DW_CHILDREN_no + .byte 3 # DW_AT_name + .byte 37 # DW_FORM_strx1 + .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 4 # Abbreviation Code + .byte 46 # DW_TAG_subprogram + .byte 0 # DW_CHILDREN_no + .byte 17 # DW_AT_low_pc + .byte 27 # DW_FORM_addrx + .byte 18 # DW_AT_high_pc + .byte 6 # DW_FORM_data4 + .byte 64 # DW_AT_frame_base + .byte 24 # DW_FORM_exprloc + .byte 122 # DW_AT_call_all_calls + .byte 25 # DW_FORM_flag_present + .byte 49 # DW_AT_abstract_origin + .byte 19 # DW_FORM_ref4 + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 5 # Abbreviation Code + .byte 46 # DW_TAG_subprogram + .byte 0 # DW_CHILDREN_no + .byte 110 # DW_AT_linkage_name + .byte 37 # DW_FORM_strx1 + .byte 3 # DW_AT_name + .byte 37 # DW_FORM_strx1 + .byte 58 # DW_AT_decl_file + .byte 11 # DW_FORM_data1 + .byte 59 # DW_AT_decl_line + .byte 11 # DW_FORM_data1 + .byte 63 # DW_AT_external + .byte 25 # DW_FORM_flag_present + .byte 32 # DW_AT_inline + .byte 33 # DW_FORM_implicit_const + .byte 1 + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 6 # Abbreviation Code + .byte 46 # DW_TAG_subprogram + .byte 1 # DW_CHILDREN_yes + .byte 17 # DW_AT_low_pc + .byte 27 # DW_FORM_addrx + .byte 18 # DW_AT_high_pc + .byte 6 # DW_FORM_data4 + .byte 64 # DW_AT_frame_base + .byte 24 # DW_FORM_exprloc + .byte 122 # DW_AT_call_all_calls + .byte 25 # DW_FORM_flag_present + .byte 3 # DW_AT_name + .byte 37 # DW_FORM_strx1 + .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 25 # DW_FORM_flag_present + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 7 # Abbreviation Code + .byte 5 # DW_TAG_formal_parameter + .byte 0 # DW_CHILDREN_no + .byte 2 # DW_AT_location + .byte 34 # DW_FORM_loclistx + .byte 3 # DW_AT_name + .byte 37 # DW_FORM_strx1 + .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 8 # Abbreviation Code + .byte 11 # DW_TAG_lexical_block + .byte 1 # DW_CHILDREN_yes + .byte 17 # DW_AT_low_pc + .byte 27 # DW_FORM_addrx + .byte 18 # DW_AT_high_pc + .byte 6 # DW_FORM_data4 + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 9 # Abbreviation Code + .byte 52 # DW_TAG_variable + .byte 0 # DW_CHILDREN_no + .byte 2 # DW_AT_location + .byte 34 # DW_FORM_loclistx + .byte 3 # DW_AT_name + .byte 37 # DW_FORM_strx1 + .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 10 # Abbreviation Code + .byte 29 # DW_TAG_inlined_subroutine + .byte 0 # DW_CHILDREN_no + .byte 49 # DW_AT_abstract_origin + .byte 19 # DW_FORM_ref4 + .byte 17 # DW_AT_low_pc + .byte 27 # DW_FORM_addrx + .byte 18 # DW_AT_high_pc + .byte 6 # DW_FORM_data4 + .byte 88 # DW_AT_call_file + .byte 11 # DW_FORM_data1 + .byte 89 # DW_AT_call_line + .byte 11 # DW_FORM_data1 + .byte 87 # DW_AT_call_column + .byte 11 # DW_FORM_data1 + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 11 # Abbreviation Code + .byte 72 # DW_TAG_call_site + .byte 1 # DW_CHILDREN_yes + .byte 127 # DW_AT_call_origin + .byte 19 # DW_FORM_ref4 + .byte 125 # DW_AT_call_return_pc + .byte 1 # DW_FORM_addr --> Manually modified + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 12 # Abbreviation Code + .byte 73 # DW_TAG_call_site_parameter + .byte 0 # DW_CHILDREN_no + .byte 2 # DW_AT_location + .byte 24 # DW_FORM_exprloc + .byte 126 # DW_AT_call_value + .byte 24 # DW_FORM_exprloc + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 13 # Abbreviation Code + .byte 46 # DW_TAG_subprogram + .byte 1 # DW_CHILDREN_yes + .byte 110 # DW_AT_linkage_name + .byte 37 # DW_FORM_strx1 + .byte 3 # DW_AT_name + .byte 37 # DW_FORM_strx1 + .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 60 # DW_AT_declaration + .byte 25 # DW_FORM_flag_present + .byte 63 # DW_AT_external + .byte 25 # DW_FORM_flag_present + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 14 # Abbreviation Code + .byte 5 # DW_TAG_formal_parameter + .byte 0 # DW_CHILDREN_no + .byte 73 # DW_AT_type + .byte 19 # DW_FORM_ref4 + .byte 0 # EOM(1) + .byte 0 # EOM(2) + .byte 15 # 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 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:0xa4 DW_TAG_compile_unit + .byte 0 # DW_AT_producer + .short 33 # DW_AT_language + .byte 1 # DW_AT_name + .long .Lstr_offsets_base0 # DW_AT_str_offsets_base + .long .Lline_table_start0 # DW_AT_stmt_list + .byte 2 # DW_AT_comp_dir + .byte 1 # DW_AT_low_pc + .long .Lfunc_end1-.Lfunc_begin0 # DW_AT_high_pc + .long .Laddr_table_base0 # DW_AT_addr_base + .long .Lloclists_table_base0 # DW_AT_loclists_base + .byte 2 # Abbrev [2] 0x27:0xb DW_TAG_variable + .byte 3 # DW_AT_name + .long 50 # DW_AT_type + # DW_AT_external + .byte 0 # DW_AT_decl_file + .byte 1 # DW_AT_decl_line + .byte 2 # DW_AT_location + .byte 161 + .byte 0 + .byte 3 # Abbrev [3] 0x32:0x4 DW_TAG_base_type + .byte 4 # DW_AT_name + .byte 5 # DW_AT_encoding + .byte 4 # DW_AT_byte_size + .byte 4 # Abbrev [4] 0x36:0xc DW_TAG_subprogram + .byte 1 # DW_AT_low_pc + .long .Lfunc_end0-.Lfunc_begin0 # DW_AT_high_pc + .byte 1 # DW_AT_frame_base + .byte 87 + # DW_AT_call_all_calls + .long 66 # DW_AT_abstract_origin + .byte 5 # Abbrev [5] 0x42:0x5 DW_TAG_subprogram + .byte 5 # DW_AT_linkage_name + .byte 6 # DW_AT_name + .byte 0 # DW_AT_decl_file + .byte 2 # DW_AT_decl_line + # DW_AT_external + # DW_AT_inline + .byte 6 # Abbrev [6] 0x47:0x4b DW_TAG_subprogram + .byte 2 # DW_AT_low_pc + .long .Lfunc_end1-.Lfunc_begin1 # DW_AT_high_pc + .byte 1 # DW_AT_frame_base + .byte 87 + # DW_AT_call_all_calls + .byte 9 # DW_AT_name + .byte 0 # DW_AT_decl_file + .byte 7 # DW_AT_decl_line + .long 50 # DW_AT_type + # DW_AT_external + .byte 7 # Abbrev [7] 0x56:0x9 DW_TAG_formal_parameter + .byte 0 # DW_AT_location + .byte 10 # DW_AT_name + .byte 0 # DW_AT_decl_file + .byte 7 # DW_AT_decl_line + .long 50 # DW_AT_type + .byte 7 # Abbrev [7] 0x5f:0x9 DW_TAG_formal_parameter + .byte 1 # DW_AT_location + .byte 11 # DW_AT_name + .byte 0 # DW_AT_decl_file + .byte 7 # DW_AT_decl_line + .long 161 # DW_AT_type + .byte 8 # Abbrev [8] 0x68:0x1d DW_TAG_lexical_block + .byte 3 # DW_AT_low_pc + .long .Ltmp8-.Ltmp4 # DW_AT_high_pc + .byte 9 # Abbrev [9] 0x6e:0x9 DW_TAG_variable + .byte 2 # DW_AT_location + .byte 13 # DW_AT_name + .byte 0 # DW_AT_decl_file + .byte 9 # DW_AT_decl_line + .long 50 # DW_AT_type + .byte 10 # Abbrev [10] 0x77:0xd DW_TAG_inlined_subroutine + .long 66 # DW_AT_abstract_origin + .byte 3 # DW_AT_low_pc + .long .Ltmp5-.Ltmp4 # DW_AT_high_pc + .byte 0 # DW_AT_call_file + .byte 10 # DW_AT_call_line + .byte 5 # DW_AT_call_column + .byte 0 # End Of Children Mark + .byte 11 # Abbrev [11] 0x85:0xc DW_TAG_call_site + .long 146 # DW_AT_call_origin + .quad .Ltmp7 # DW_AT_call_return_pc --> Manually modified + .byte 12 # Abbrev [12] 0x8b:0x5 DW_TAG_call_site_parameter + .byte 1 # DW_AT_location + .byte 85 + .byte 1 # DW_AT_call_value + .byte 53 + .byte 0 # End Of Children Mark + .byte 0 # End Of Children Mark + .byte 13 # Abbrev [13] 0x92:0xf DW_TAG_subprogram + .byte 7 # DW_AT_linkage_name + .byte 8 # DW_AT_name + .byte 0 # DW_AT_decl_file + .byte 6 # DW_AT_decl_line + .long 50 # DW_AT_type + # DW_AT_declaration + # DW_AT_external + .byte 14 # Abbrev [14] 0x9b:0x5 DW_TAG_formal_parameter + .long 50 # DW_AT_type + .byte 0 # End Of Children Mark + .byte 15 # Abbrev [15] 0xa1:0x5 DW_TAG_pointer_type + .long 166 # DW_AT_type + .byte 15 # Abbrev [15] 0xa6:0x5 DW_TAG_pointer_type + .long 171 # DW_AT_type + .byte 3 # Abbrev [3] 0xab:0x4 DW_TAG_base_type + .byte 12 # DW_AT_name + .byte 6 # DW_AT_encoding + .byte 1 # DW_AT_byte_size + .byte 0 # End Of Children Mark +.Ldebug_info_end0: + .section .debug_str_offsets,"",@progbits + .long 60 # Length of String Offsets Set + .short 5 + .short 0 +.Lstr_offsets_base0: + .section .debug_str,"MS",@progbits,1 +.Linfo_string0: + .asciz "clang version 15.0.0" # string offset=0 +.Linfo_string1: + .asciz "main.cpp" # string offset=134 +.Linfo_string2: + .asciz "." # string offset=143 +.Linfo_string3: + .asciz "fooVar0" # string offset=191 +.Linfo_string4: + .asciz "int" # string offset=199 +.Linfo_string5: + .asciz "_Z3usev" # string offset=203 +.Linfo_string6: + .asciz "use" # string offset=211 +.Linfo_string7: + .asciz "_Z4foo0i" # string offset=215 +.Linfo_string8: + .asciz "foo0" # string offset=224 +.Linfo_string9: + .asciz "main" # string offset=229 +.Linfo_string10: + .asciz "argc" # string offset=234 +.Linfo_string11: + .asciz "argv" # string offset=239 +.Linfo_string12: + .asciz "char" # string offset=244 +.Linfo_string13: + .asciz "x" # string offset=249 + .section .debug_str_offsets,"",@progbits + .long .Linfo_string0 + .long .Linfo_string1 + .long .Linfo_string2 + .long .Linfo_string3 + .long .Linfo_string4 + .long .Linfo_string5 + .long .Linfo_string6 + .long .Linfo_string7 + .long .Linfo_string8 + .long .Linfo_string9 + .long .Linfo_string10 + .long .Linfo_string11 + .long .Linfo_string12 + .long .Linfo_string13 + .section .debug_addr,"",@progbits + .long .Ldebug_addr_end0-.Ldebug_addr_start0 # Length of contribution +.Ldebug_addr_start0: + .short 5 # DWARF version number + .byte 8 # Address size + .byte 0 # Segment selector size +.Laddr_table_base0: + .quad fooVar0 + .quad .Lfunc_begin0 + .quad .Lfunc_begin1 + .quad .Ltmp4 + .quad .Ltmp7 +.Ldebug_addr_end0: + .ident "clang version 15.0.0" + .section ".note.GNU-stack","",@progbits + .addrsig + .section .debug_line,"",@progbits +.Lline_table_start0: diff --git a/bolt/test/X86/dwarf5-return-pc-form-addr.test b/bolt/test/X86/dwarf5-return-pc-form-addr.test new file mode 100644 index 0000000..737aae9 --- /dev/null +++ b/bolt/test/X86/dwarf5-return-pc-form-addr.test @@ -0,0 +1,29 @@ +# REQUIRES: system-linux + +# RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-return-pc-form-addr-main.s -o %tmain.o +# RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-return-pc-helper.s -o %thelper.o +# RUN: %clang %cflags -dwarf-5 %tmain.o %thelper.o -o %t.exe -Wl,-q +# RUN: llvm-bolt %t.exe -o %t.exe.bolt --update-debug-sections -reorder-blocks=reverse +# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.exe > %tmain.txt +# RUN: llvm-objdump %t.exe --disassemble >> %tmain.txt +# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.exe.bolt > %tmainbolt.txt +# RUN: llvm-objdump %t.exe.bolt --disassemble >> %tmainbolt.txt +# RUN: cat %tmain.txt | FileCheck --check-prefix=PRECHECK %s +# RUN: cat %tmainbolt.txt | FileCheck --check-prefix=POSTCHECK %s + +# Test checks that DW_AT_call_return_pc points to an address after the callq instruction. + +# PRECHECK: DW_TAG_call_site [11] +# PRECHECK-NEXT: DW_AT_call_origin [DW_FORM_ref4] +# PRECHECK-NEXT: DW_AT_call_return_pc [DW_FORM_addr] +# PRECHECK-SAME: 0x[[#%x,ADDR:]]) +# PRECHECK: callq +# PRECHECK-NEXT: [[#ADDR]]: + +# POSTCHECK: DW_TAG_call_site [11] +# POSTCHECK-NEXT: DW_AT_call_origin [DW_FORM_ref4] +# POSTCHECK-NEXT: DW_AT_call_return_pc [DW_FORM_addr] +# POSTCHECK-SAME: 0x[[#%x,ADDR:]]) +# POSTCHECK:
: +# POSTCHECK: callq +# POSTCHECK-NEXT: [[#ADDR]]: -- 2.7.4