[Lldb-commits] [lldb] ad74df1 - Revert "[lldb][DWARFExpression] Fix DW_OP_div to use signed division"
Michael Buch via lldb-commits
lldb-commits at lists.llvm.org
Tue May 2 12:37:13 PDT 2023
Author: Michael Buch
Date: 2023-05-02T15:36:56-04:00
New Revision: ad74df12b8b2949bd6f45dc469dc41d488e69f78
URL: https://github.com/llvm/llvm-project/commit/ad74df12b8b2949bd6f45dc469dc41d488e69f78
DIFF: https://github.com/llvm/llvm-project/commit/ad74df12b8b2949bd6f45dc469dc41d488e69f78.diff
LOG: Revert "[lldb][DWARFExpression] Fix DW_OP_div to use signed division"
This reverts commit e15d6b520e1e85d2cdf9ffc66f0c4698390eaa3d.
Newly added test fails on Darwin platforms and arm.
Differential Revision: https://reviews.llvm.org/D147370
Added:
Modified:
lldb/source/Expression/DWARFExpression.cpp
Removed:
lldb/test/Shell/SymbolFile/DWARF/x86/DW_OP_div-with-signed.s
################################################################################
diff --git a/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp
index 9232282d81353..f2ca6534c2fc1 100644
--- a/lldb/source/Expression/DWARFExpression.cpp
+++ b/lldb/source/Expression/DWARFExpression.cpp
@@ -1436,12 +1436,8 @@ bool DWARFExpression::Evaluate(
return false;
} else {
stack.pop_back();
- Scalar divisor, dividend;
- divisor = tmp.ResolveValue(exe_ctx);
- dividend = stack.back().ResolveValue(exe_ctx);
- divisor.MakeSigned();
- dividend.MakeSigned();
- stack.back() = dividend / divisor;
+ stack.back() =
+ stack.back().ResolveValue(exe_ctx) / tmp.ResolveValue(exe_ctx);
if (!stack.back().ResolveValue(exe_ctx).IsValid()) {
if (error_ptr)
error_ptr->SetErrorString("Divide failed.");
diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/DW_OP_div-with-signed.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_OP_div-with-signed.s
deleted file mode 100644
index f6fbcdadfdc8d..0000000000000
--- a/lldb/test/Shell/SymbolFile/DWARF/x86/DW_OP_div-with-signed.s
+++ /dev/null
@@ -1,468 +0,0 @@
- # Test handling of values represented via DW_OP_div
-
- # RUN: %clang --target=x86_64-pc-linux -o %t %s
- # RUN: %lldb %t -o "b f" -o "r" -o "c" -o "c" -o "expression -T -- i" \
- # RUN: -o "exit" | FileCheck %s
-
- # Failing case was:
- # (uint32_t) $0 = 0
- # CHECK: (uint32_t) $0 = 2
-
- # This case is generated from the following code:
- # #include "stdint.h"
- # static volatile uint64_t g = 0;
- # static const int32_t f()
- # {
- # uint32_t i;
- # for (i = 0; (i != 10); i++)
- # ++g;
- # return 0;
- #
- # }
- #
- # int main()
- # {
- # f();
- # return 0;
- #
- # }
-
- .text
- .file "signed_dw_op_div.c"
- .file 1 "/usr/local/include/bits" "types.h" md5 0x96c0983c9cdaf387938a8268d00aa594
- .file 2 "/usr/local/include/bits" "stdint-uintn.h" md5 0xbedfab747425222bb150968c14e40abd
- .globl main # -- Begin function main
- .p2align 4, 0x90
- .type main, at function
-main: # @main
-.Lfunc_begin0:
- .loc 0 13 0 # signed_dw_op_div.c:13:0
- .cfi_startproc
-# %bb.0:
- movl $3, %eax
- #DEBUG_VALUE: f:i <- 0
- .p2align 4, 0x90
-.LBB0_1: # =>This Inner Loop Header: Depth=1
-.Ltmp0:
- #DEBUG_VALUE: f:i <- [DW_OP_consts 3, DW_OP_minus, DW_OP_consts 18446744073709551615, DW_OP_div, DW_OP_stack_value] $eax
- .loc 0 8 7 prologue_end # signed_dw_op_div.c:8:7
- incq g(%rip)
-.Ltmp1:
- #DEBUG_VALUE: f:i <- [DW_OP_consts 3, DW_OP_minus, DW_OP_consts 18446744073709551615, DW_OP_div, DW_OP_consts 1, DW_OP_plus, DW_OP_stack_value] $eax
- .loc 0 7 20 # signed_dw_op_div.c:7:20
- decl %eax
-.Ltmp2:
- .loc 0 7 5 is_stmt 0 # signed_dw_op_div.c:7:5
- jne .LBB0_1
-.Ltmp3:
-# %bb.2:
- .loc 0 15 5 is_stmt 1 # signed_dw_op_div.c:15:5
- xorl %eax, %eax
- retq
-.Ltmp4:
-.Lfunc_end0:
- .size main, .Lfunc_end0-main
- .cfi_endproc
- .file 3 "/usr/local/include/bits" "stdint-intn.h" md5 0x90039fb90b44dcbf118222513050fe57
- # -- End function
- .type g, at object # @g
- .local g
- .comm g,8,8
- .section .debug_loclists,"", at 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 1 # Offset entry count
-.Lloclists_table_base0:
- .long .Ldebug_loc0-.Lloclists_table_base0
-.Ldebug_loc0:
- .byte 4 # DW_LLE_offset_pair
- .uleb128 .Ltmp0-.Lfunc_begin0 # starting offset
- .uleb128 .Ltmp1-.Lfunc_begin0 # ending offset
- .byte 16 # Loc expr size
- .byte 112 # DW_OP_breg0
- .byte 0 # 0
- .byte 16 # DW_OP_constu
- .byte 255 # 4294967295
- .byte 255 #
- .byte 255 #
- .byte 255 #
- .byte 15 #
- .byte 26 # DW_OP_and
- .byte 17 # DW_OP_consts
- .byte 3 # 3
- .byte 28 # DW_OP_minus
- .byte 17 # DW_OP_consts
- .byte 127 # -1
- .byte 27 # DW_OP_div
- .byte 159 # DW_OP_stack_value
- .byte 4 # DW_LLE_offset_pair
- .uleb128 .Ltmp1-.Lfunc_begin0 # starting offset
- .uleb128 .Ltmp2-.Lfunc_begin0 # ending offset
- .byte 19 # Loc expr size
- .byte 112 # DW_OP_breg0
- .byte 0 # 0
- .byte 16 # DW_OP_constu
- .byte 255 # 4294967295
- .byte 255 #
- .byte 255 #
- .byte 255 #
- .byte 15 #
- .byte 26 # DW_OP_and
- .byte 17 # DW_OP_consts
- .byte 3 # 3
- .byte 28 # DW_OP_minus
- .byte 17 # DW_OP_consts
- .byte 127 # -1
- .byte 27 # DW_OP_div
- .byte 17 # DW_OP_consts
- .byte 1 # 1
- .byte 34 # DW_OP_plus
- .byte 159 # DW_OP_stack_value
- .byte 0 # DW_LLE_end_of_list
-.Ldebug_list_header_end0:
- .section .debug_abbrev,"", at 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 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 53 # DW_TAG_volatile_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 4 # Abbreviation Code
- .byte 22 # DW_TAG_typedef
- .byte 0 # DW_CHILDREN_no
- .byte 73 # DW_AT_type
- .byte 19 # DW_FORM_ref4
- .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 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 5 # 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 6 # Abbreviation Code
- .byte 46 # DW_TAG_subprogram
- .byte 1 # DW_CHILDREN_yes
- .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 54 # DW_AT_calling_convention
- .byte 11 # DW_FORM_data1
- .byte 73 # DW_AT_type
- .byte 19 # DW_FORM_ref4
- .byte 32 # DW_AT_inline
- .byte 33 # DW_FORM_implicit_const
- .byte 1
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 7 # Abbreviation Code
- .byte 52 # DW_TAG_variable
- .byte 0 # DW_CHILDREN_no
- .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 38 # DW_TAG_const_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 9 # 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 10 # Abbreviation Code
- .byte 29 # DW_TAG_inlined_subroutine
- .byte 1 # DW_CHILDREN_yes
- .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 52 # DW_TAG_variable
- .byte 0 # DW_CHILDREN_no
- .byte 2 # DW_AT_location
- .byte 34 # DW_FORM_loclistx
- .byte 49 # DW_AT_abstract_origin
- .byte 19 # DW_FORM_ref4
- .byte 0 # EOM(1)
- .byte 0 # EOM(2)
- .byte 0 # EOM(3)
- .section .debug_info,"", at 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:0xa3 DW_TAG_compile_unit
- .byte 0 # DW_AT_producer
- .short 12 # 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_end0-.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
- .byte 0 # DW_AT_decl_file
- .byte 2 # DW_AT_decl_line
- .byte 2 # DW_AT_location
- .byte 161
- .byte 0
- .byte 3 # Abbrev [3] 0x32:0x5 DW_TAG_volatile_type
- .long 55 # DW_AT_type
- .byte 4 # Abbrev [4] 0x37:0x8 DW_TAG_typedef
- .long 63 # DW_AT_type
- .byte 6 # DW_AT_name
- .byte 2 # DW_AT_decl_file
- .byte 27 # DW_AT_decl_line
- .byte 4 # Abbrev [4] 0x3f:0x8 DW_TAG_typedef
- .long 71 # DW_AT_type
- .byte 5 # DW_AT_name
- .byte 1 # DW_AT_decl_file
- .byte 45 # DW_AT_decl_line
- .byte 5 # Abbrev [5] 0x47:0x4 DW_TAG_base_type
- .byte 4 # DW_AT_name
- .byte 7 # DW_AT_encoding
- .byte 8 # DW_AT_byte_size
- .byte 6 # Abbrev [6] 0x4b:0x12 DW_TAG_subprogram
- .byte 7 # DW_AT_name
- .byte 0 # DW_AT_decl_file
- .byte 4 # DW_AT_decl_line
- .byte 3 # DW_AT_calling_convention
- .long 93 # DW_AT_type
- # DW_AT_inline
- .byte 7 # Abbrev [7] 0x54:0x8 DW_TAG_variable
- .byte 11 # DW_AT_name
- .byte 0 # DW_AT_decl_file
- .byte 6 # DW_AT_decl_line
- .long 118 # DW_AT_type
- .byte 0 # End Of Children Mark
- .byte 8 # Abbrev [8] 0x5d:0x5 DW_TAG_const_type
- .long 98 # DW_AT_type
- .byte 4 # Abbrev [4] 0x62:0x8 DW_TAG_typedef
- .long 106 # DW_AT_type
- .byte 10 # DW_AT_name
- .byte 3 # DW_AT_decl_file
- .byte 26 # DW_AT_decl_line
- .byte 4 # Abbrev [4] 0x6a:0x8 DW_TAG_typedef
- .long 114 # DW_AT_type
- .byte 9 # DW_AT_name
- .byte 1 # DW_AT_decl_file
- .byte 41 # DW_AT_decl_line
- .byte 5 # Abbrev [5] 0x72:0x4 DW_TAG_base_type
- .byte 8 # DW_AT_name
- .byte 5 # DW_AT_encoding
- .byte 4 # DW_AT_byte_size
- .byte 4 # Abbrev [4] 0x76:0x8 DW_TAG_typedef
- .long 126 # DW_AT_type
- .byte 14 # DW_AT_name
- .byte 2 # DW_AT_decl_file
- .byte 26 # DW_AT_decl_line
- .byte 4 # Abbrev [4] 0x7e:0x8 DW_TAG_typedef
- .long 134 # DW_AT_type
- .byte 13 # DW_AT_name
- .byte 1 # DW_AT_decl_file
- .byte 42 # DW_AT_decl_line
- .byte 5 # Abbrev [5] 0x86:0x4 DW_TAG_base_type
- .byte 12 # DW_AT_name
- .byte 7 # DW_AT_encoding
- .byte 4 # DW_AT_byte_size
- .byte 9 # Abbrev [9] 0x8a:0x24 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
- .byte 15 # DW_AT_name
- .byte 0 # DW_AT_decl_file
- .byte 12 # DW_AT_decl_line
- .long 114 # DW_AT_type
- # DW_AT_external
- .byte 10 # Abbrev [10] 0x99:0x14 DW_TAG_inlined_subroutine
- .long 75 # DW_AT_abstract_origin
- .byte 2 # DW_AT_low_pc
- .long .Ltmp3-.Ltmp0 # DW_AT_high_pc
- .byte 0 # DW_AT_call_file
- .byte 14 # DW_AT_call_line
- .byte 5 # DW_AT_call_column
- .byte 11 # Abbrev [11] 0xa6:0x6 DW_TAG_variable
- .byte 0 # DW_AT_location
- .long 84 # DW_AT_abstract_origin
- .byte 0 # End Of Children Mark
- .byte 0 # End Of Children Mark
- .byte 0 # End Of Children Mark
-.Ldebug_info_end0:
- .section .debug_str_offsets,"", at progbits
- .long 68 # Length of String Offsets Set
- .short 5
- .short 0
-.Lstr_offsets_base0:
- .section .debug_str,"MS", at progbits,1
-.Linfo_string0:
- .asciz "Ubuntu clang version 15.0.7" # string offset=0
-.Linfo_string1:
- .asciz "signed_dw_op_div.c" # string offset=28
-.Linfo_string2:
- .asciz "" # string offset=47
-.Linfo_string3:
- .asciz "g" # string offset=84
-.Linfo_string4:
- .asciz "unsigned long" # string offset=86
-.Linfo_string5:
- .asciz "__uint64_t" # string offset=100
-.Linfo_string6:
- .asciz "uint64_t" # string offset=111
-.Linfo_string7:
- .asciz "f" # string offset=120
-.Linfo_string8:
- .asciz "int" # string offset=122
-.Linfo_string9:
- .asciz "__int32_t" # string offset=126
-.Linfo_string10:
- .asciz "int32_t" # string offset=136
-.Linfo_string11:
- .asciz "i" # string offset=144
-.Linfo_string12:
- .asciz "unsigned int" # string offset=146
-.Linfo_string13:
- .asciz "__uint32_t" # string offset=159
-.Linfo_string14:
- .asciz "uint32_t" # string offset=170
-.Linfo_string15:
- .asciz "main" # string offset=179
- .section .debug_str_offsets,"", at 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
- .long .Linfo_string14
- .long .Linfo_string15
- .section .debug_addr,"", at 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 g
- .quad .Lfunc_begin0
- .quad .Ltmp0
-.Ldebug_addr_end0:
- .ident "Ubuntu clang version 15.0.7"
- .section ".note.GNU-stack","", at progbits
- .addrsig
- .addrsig_sym g
- .section .debug_line,"", at progbits
-.Lline_table_start0:
More information about the lldb-commits
mailing list