Revert "[LLDB] Handle DIE with DW_AT_low_pc and empty ranges"
authorDavid Spickett <david.spickett@linaro.org>
Thu, 23 Jun 2022 10:33:05 +0000 (10:33 +0000)
committerDavid Spickett <david.spickett@linaro.org>
Thu, 23 Jun 2022 10:33:05 +0000 (10:33 +0000)
This reverts commit 1beededc0e7d86d09cee972f0b9f0030a139cab4.

Due to failures on the Arm/AArch64 build bots:
https://lab.llvm.org/buildbot/#/builders/96/builds/25032

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
lldb/test/Shell/Commands/Inputs/dwarf4-low-pc-ranges-inlining.s [deleted file]
lldb/test/Shell/Commands/Inputs/dwarf5-low-pc-ranges-inlining.s [deleted file]
lldb/test/Shell/Commands/dwarf4-low-pc-ranges-inlining.test [deleted file]
lldb/test/Shell/Commands/dwarf5-low-pc-ranges-inlining.test [deleted file]

index 7be67f8..c0bf13e 100644 (file)
@@ -1279,8 +1279,6 @@ size_t SymbolFileDWARF::ParseBlocksRecursive(
         const size_t num_ranges = ranges.GetSize();
         for (size_t i = 0; i < num_ranges; ++i) {
           const DWARFRangeList::Entry &range = ranges.GetEntryRef(i);
-          if (range.GetByteSize() == 0)
-            continue;
           const addr_t range_base = range.GetRangeBase();
           if (range_base >= subprogram_low_pc)
             block->AddRange(Block::Range(range_base - subprogram_low_pc,
diff --git a/lldb/test/Shell/Commands/Inputs/dwarf4-low-pc-ranges-inlining.s b/lldb/test/Shell/Commands/Inputs/dwarf4-low-pc-ranges-inlining.s
deleted file mode 100644 (file)
index 458e262..0000000
+++ /dev/null
@@ -1,369 +0,0 @@
-
-# Manually modified to have DW_AT_ranges point to end list.
-# int helper(int i) {
-#   return ++i;
-# }
-#
-# int main(int argc, char *argv[]) {
-#   return helper(argc);
-# }
-
-# Manually modified DW_TAG_inlined_subroutine to have DW_AT_low_pc with value 0,
-# and DW_AT_ranges to point to end ranges list.
-
-       .text
-       .file   "main.cpp"
-       .section        .text._Z6helperi,"ax",@progbits
-       .globl  _Z6helperi                      # -- Begin function _Z6helperi
-       .p2align        4, 0x90
-       .type   _Z6helperi,@function
-_Z6helperi:                             # @_Z6helperi
-.Lfunc_begin0:
-       .file   1 "/home/test" "main.cpp"
-       .loc    1 1 0                           # main.cpp:1:0
-       .cfi_startproc
-# %bb.0:                                # %entry
-       #DEBUG_VALUE: helper:i <- $edi
-                                        # kill: def $edi killed $edi def $rdi
-       .loc    1 2 10 prologue_end             # main.cpp:2:10
-       leal    1(%rdi), %eax
-.Ltmp0:
-       #DEBUG_VALUE: helper:i <- $eax
-       .loc    1 2 3 is_stmt 0                 # main.cpp:2:3
-       retq
-.Ltmp1:
-.Lfunc_end0:
-       .size   _Z6helperi, .Lfunc_end0-_Z6helperi
-       .cfi_endproc
-                                        # -- End function
-       .section        .text.main,"ax",@progbits
-       .globl  main                            # -- Begin function main
-       .p2align        4, 0x90
-       .type   main,@function
-main:                                   # @main
-.Lfunc_begin1:
-       .loc    1 5 0 is_stmt 1                 # main.cpp:5:0
-       .cfi_startproc
-# %bb.0:                                # %entry
-       #DEBUG_VALUE: main:argc <- $edi
-       #DEBUG_VALUE: main:argv <- $rsi
-       #DEBUG_VALUE: helper:i <- $edi
-                                        # kill: def $edi killed $edi def $rdi
-       .loc    1 2 10 prologue_end             # main.cpp:2:10
-       leal    1(%rdi), %eax
-.Ltmp2:
-       #DEBUG_VALUE: helper:i <- $eax
-       .loc    1 6 3                           # main.cpp:6:3
-       retq
-.Ltmp3:
-.Lfunc_end1:
-       .size   main, .Lfunc_end1-main
-       .cfi_endproc
-                                        # -- End function
-       .section        .debug_loc,"",@progbits
-.Ldebug_loc0:
-       .quad   -1
-       .quad   .Lfunc_begin0                   #   base address
-       .quad   .Lfunc_begin0-.Lfunc_begin0
-       .quad   .Ltmp0-.Lfunc_begin0
-       .short  1                               # Loc expr size
-       .byte   85                              # super-register DW_OP_reg5
-       .quad   .Ltmp0-.Lfunc_begin0
-       .quad   .Lfunc_end0-.Lfunc_begin0
-       .short  1                               # Loc expr size
-       .byte   80                              # super-register DW_OP_reg0
-       .quad   0
-       .quad   0
-.Ldebug_loc1:
-       .quad   -1
-       .quad   .Lfunc_begin1                   #   base address
-       .quad   .Lfunc_begin1-.Lfunc_begin1
-       .quad   .Ltmp2-.Lfunc_begin1
-       .short  1                               # Loc expr size
-       .byte   85                              # super-register DW_OP_reg5
-       .quad   .Ltmp2-.Lfunc_begin1
-       .quad   .Lfunc_end1-.Lfunc_begin1
-       .short  1                               # Loc expr size
-       .byte   80                              # super-register DW_OP_reg0
-       .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   23                              # DW_FORM_sec_offset
-       .byte   27                              # DW_AT_comp_dir
-       .byte   14                              # DW_FORM_strp
-       .byte   17                              # DW_AT_low_pc
-       .byte   1                               # DW_FORM_addr
-       .byte   85                              # DW_AT_ranges
-       .byte   23                              # DW_FORM_sec_offset
-       .byte   0                               # EOM(1)
-       .byte   0                               # EOM(2)
-       .byte   2                               # 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   6                               # DW_FORM_data4
-       .byte   64                              # DW_AT_frame_base
-       .byte   24                              # DW_FORM_exprloc
-       .ascii  "\227B"                         # DW_AT_GNU_all_call_sites
-       .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   3                               # Abbreviation Code
-       .byte   5                               # DW_TAG_formal_parameter
-       .byte   0                               # DW_CHILDREN_no
-       .byte   2                               # DW_AT_location
-       .byte   23                              # DW_FORM_sec_offset
-       .byte   49                              # DW_AT_abstract_origin
-       .byte   19                              # DW_FORM_ref4
-       .byte   0                               # EOM(1)
-       .byte   0                               # EOM(2)
-       .byte   4                               # Abbreviation Code
-       .byte   46                              # DW_TAG_subprogram
-       .byte   1                               # DW_CHILDREN_yes
-       .byte   110                             # DW_AT_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   25                              # DW_FORM_flag_present
-       .byte   32                              # DW_AT_inline
-       .byte   11                              # DW_FORM_data1
-       .byte   0                               # EOM(1)
-       .byte   0                               # EOM(2)
-       .byte   5                               # Abbreviation Code
-       .byte   5                               # DW_TAG_formal_parameter
-       .byte   0                               # DW_CHILDREN_no
-       .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   6                               # 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   7                               # 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   6                               # DW_FORM_data4
-       .byte   64                              # DW_AT_frame_base
-       .byte   24                              # DW_FORM_exprloc
-       .ascii  "\227B"                         # DW_AT_GNU_all_call_sites
-       .byte   25                              # DW_FORM_flag_present
-       .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   25                              # DW_FORM_flag_present
-       .byte   0                               # EOM(1)
-       .byte   0                               # EOM(2)
-       .byte   8                               # Abbreviation Code
-       .byte   5                               # DW_TAG_formal_parameter
-       .byte   0                               # DW_CHILDREN_no
-       .byte   2                               # DW_AT_location
-       .byte   24                              # DW_FORM_exprloc
-       .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   9                               # 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   1                               # DW_FORM_addr
-       .byte   85                              # DW_AT_ranges
-       .byte   23                              # DW_FORM_sec_offset
-       .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   10                              # 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  4                               # DWARF version number
-       .long   .debug_abbrev                   # Offset Into Abbrev. Section
-       .byte   8                               # Address Size (in bytes)
-       .byte   1                               # Abbrev [1] 0xb:0xc3 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   0                               # DW_AT_low_pc
-       .long   .Ldebug_ranges0                 # DW_AT_ranges
-       .byte   2                               # Abbrev [2] 0x2a:0x1d DW_TAG_subprogram
-       .quad   .Lfunc_begin0                   # DW_AT_low_pc
-       .long   .Lfunc_end0-.Lfunc_begin0       # DW_AT_high_pc
-       .byte   1                               # DW_AT_frame_base
-       .byte   87
-                                        # DW_AT_GNU_all_call_sites
-       .long   71                              # DW_AT_abstract_origin
-       .byte   3                               # Abbrev [3] 0x3d:0x9 DW_TAG_formal_parameter
-       .long   .Ldebug_loc0                    # DW_AT_location
-       .long   87                              # DW_AT_abstract_origin
-       .byte   0                               # End Of Children Mark
-       .byte   4                               # Abbrev [4] 0x47:0x1c DW_TAG_subprogram
-       .long   .Linfo_string3                  # DW_AT_linkage_name
-       .long   .Linfo_string4                  # DW_AT_name
-       .byte   1                               # DW_AT_decl_file
-       .byte   1                               # DW_AT_decl_line
-       .long   99                              # DW_AT_type
-                                        # DW_AT_external
-       .byte   1                               # DW_AT_inline
-       .byte   5                               # Abbrev [5] 0x57:0xb DW_TAG_formal_parameter
-       .long   .Linfo_string6                  # DW_AT_name
-       .byte   1                               # DW_AT_decl_file
-       .byte   1                               # DW_AT_decl_line
-       .long   99                              # DW_AT_type
-       .byte   0                               # End Of Children Mark
-       .byte   6                               # Abbrev [6] 0x63:0x7 DW_TAG_base_type
-       .long   .Linfo_string5                  # DW_AT_name
-       .byte   5                               # DW_AT_encoding
-       .byte   4                               # DW_AT_byte_size
-       .byte   7                               # Abbrev [7] 0x6a:0x52 DW_TAG_subprogram
-       .quad   .Lfunc_begin1                   # DW_AT_low_pc
-       .long   .Lfunc_end1-.Lfunc_begin1       # DW_AT_high_pc
-       .byte   1                               # DW_AT_frame_base
-       .byte   87
-                                        # DW_AT_GNU_all_call_sites
-       .long   .Linfo_string7                  # DW_AT_name
-       .byte   1                               # DW_AT_decl_file
-       .byte   5                               # DW_AT_decl_line
-       .long   99                              # DW_AT_type
-                                        # DW_AT_external
-       .byte   8                               # Abbrev [8] 0x83:0xd DW_TAG_formal_parameter
-       .byte   1                               # DW_AT_location
-       .byte   85
-       .long   .Linfo_string8                  # DW_AT_name
-       .byte   1                               # DW_AT_decl_file
-       .byte   5                               # DW_AT_decl_line
-       .long   99                              # DW_AT_type
-       .byte   8                               # Abbrev [8] 0x90:0xd DW_TAG_formal_parameter
-       .byte   1                               # DW_AT_location
-       .byte   84
-       .long   .Linfo_string9                  # DW_AT_name
-       .byte   1                               # DW_AT_decl_file
-       .byte   5                               # DW_AT_decl_line
-       .long   188                             # DW_AT_type
-       .byte   9                               # Abbrev [9] 0x9d:0x1e DW_TAG_inlined_subroutine
-       .long   71                              # DW_AT_abstract_origin
-       .quad   0                               # DW_AT_low_pc
-       .long   .Ldebug_ranges1                 # DW_AT_ranges
-       .byte   1                               # DW_AT_call_file
-       .byte   6                               # DW_AT_call_line
-       .byte   10                              # DW_AT_call_column
-       .byte   3                               # Abbrev [3] 0xb1:0x9 DW_TAG_formal_parameter
-       .long   .Ldebug_loc1                    # DW_AT_location
-       .long   87                              # DW_AT_abstract_origin
-       .byte   0                               # End Of Children Mark
-       .byte   0                               # End Of Children Mark
-       .byte   10                              # Abbrev [10] 0xbc:0x5 DW_TAG_pointer_type
-       .long   193                             # DW_AT_type
-       .byte   10                              # Abbrev [10] 0xc1:0x5 DW_TAG_pointer_type
-       .long   198                             # DW_AT_type
-       .byte   6                               # Abbrev [6] 0xc6:0x7 DW_TAG_base_type
-       .long   .Linfo_string10                 # 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_ranges,"",@progbits
-.Ldebug_ranges0:
-       .quad   .Lfunc_begin0
-       .quad   .Lfunc_end0
-       .quad   .Lfunc_begin1
-       .quad   .Lfunc_end1
-       .quad   0
-       .quad   0
-.Ldebug_ranges1:
-  .quad 0
-  .quad 0
-  .section     .debug_str,"MS",@progbits,1
-.Linfo_string0:
-       .asciz  "clang version 15.0.0" # string offset=0
-.Linfo_string1:
-       .asciz  "main.cpp"                      # string offset=105
-.Linfo_string2:
-       .asciz  "/home/test" # string offset=114
-.Linfo_string3:
-       .asciz  "_Z6helperi"                    # string offset=152
-.Linfo_string4:
-       .asciz  "helper"                        # string offset=163
-.Linfo_string5:
-       .asciz  "int"                           # string offset=170
-.Linfo_string6:
-       .asciz  "i"                             # string offset=174
-.Linfo_string7:
-       .asciz  "main"                          # string offset=176
-.Linfo_string8:
-       .asciz  "argc"                          # string offset=181
-.Linfo_string9:
-       .asciz  "argv"                          # string offset=186
-.Linfo_string10:
-       .asciz  "char"                          # string offset=191
-       .ident  "clang version 15.0.0"
-       .section        ".note.GNU-stack","",@progbits
-       .addrsig
-       .section        .debug_line,"",@progbits
-.Lline_table_start0:
diff --git a/lldb/test/Shell/Commands/Inputs/dwarf5-low-pc-ranges-inlining.s b/lldb/test/Shell/Commands/Inputs/dwarf5-low-pc-ranges-inlining.s
deleted file mode 100644 (file)
index 9430fa2..0000000
+++ /dev/null
@@ -1,429 +0,0 @@
-# Manually modified to have DW_AT_ranges point to end list.
-# int helper(int i) {
-#   return ++i;
-# }
-#
-# int main(int argc, char *argv[]) {
-#   return helper(argc);
-# }
-
-       .text
-       .file   "main.cpp"
-       .section        .text._Z6helperi,"ax",@progbits
-       .globl  _Z6helperi                      # -- Begin function _Z6helperi
-       .p2align        4, 0x90
-       .type   _Z6helperi,@function
-_Z6helperi:                             # @_Z6helperi
-.Lfunc_begin0:
-       .file   0 "/home/test" "main.cpp" md5 0x3fc4870015f8bb98cd719b92f3dca96e
-       .loc    0 1 0                           # main.cpp:1:0
-       .cfi_startproc
-# %bb.0:                                # %entry
-       #DEBUG_VALUE: helper:i <- $edi
-                                        # kill: def $edi killed $edi def $rdi
-       .loc    0 2 10 prologue_end             # main.cpp:2:10
-       leal    1(%rdi), %eax
-.Ltmp0:
-       #DEBUG_VALUE: helper:i <- $eax
-       .loc    0 2 3 is_stmt 0                 # main.cpp:2:3
-       retq
-.Ltmp1:
-.Lfunc_end0:
-       .size   _Z6helperi, .Lfunc_end0-_Z6helperi
-       .cfi_endproc
-                                        # -- End function
-       .section        .text.main,"ax",@progbits
-       .globl  main                            # -- Begin function main
-       .p2align        4, 0x90
-       .type   main,@function
-main:                                   # @main
-.Lfunc_begin1:
-       .loc    0 5 0 is_stmt 1                 # main.cpp:5:0
-       .cfi_startproc
-# %bb.0:                                # %entry
-       #DEBUG_VALUE: main:argc <- $edi
-       #DEBUG_VALUE: main:argv <- $rsi
-       #DEBUG_VALUE: helper:i <- $edi
-                                        # kill: def $edi killed $edi def $rdi
-       .loc    0 2 10 prologue_end             # main.cpp:2:10
-       leal    1(%rdi), %eax
-.Ltmp2:
-       #DEBUG_VALUE: helper:i <- $eax
-       .loc    0 6 3                           # main.cpp:6:3
-       retq
-.Ltmp3:
-.Lfunc_end1:
-       .size   main, .Lfunc_end1-main
-       .cfi_endproc
-                                        # -- End function
-       .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   2                               # Offset entry count
-.Lloclists_table_base0:
-       .long   .Ldebug_loc0-.Lloclists_table_base0
-       .long   .Ldebug_loc1-.Lloclists_table_base0
-.Ldebug_loc0:
-       .byte   1                               # DW_LLE_base_addressx
-       .byte   0                               #   base address index
-       .byte   4                               # DW_LLE_offset_pair
-       .uleb128 .Lfunc_begin0-.Lfunc_begin0    #   starting offset
-       .uleb128 .Ltmp0-.Lfunc_begin0           #   ending offset
-       .byte   1                               # Loc expr size
-       .byte   85                              # super-register DW_OP_reg5
-       .byte   4                               # DW_LLE_offset_pair
-       .uleb128 .Ltmp0-.Lfunc_begin0           #   starting offset
-       .uleb128 .Lfunc_end0-.Lfunc_begin0      #   ending offset
-       .byte   1                               # Loc expr size
-       .byte   80                              # super-register DW_OP_reg0
-       .byte   0                               # DW_LLE_end_of_list
-.Ldebug_loc1:
-       .byte   1                               # DW_LLE_base_addressx
-       .byte   1                               #   base address index
-       .byte   4                               # DW_LLE_offset_pair
-       .uleb128 .Lfunc_begin1-.Lfunc_begin1    #   starting offset
-       .uleb128 .Ltmp2-.Lfunc_begin1           #   ending offset
-       .byte   1                               # Loc expr size
-       .byte   85                              # super-register DW_OP_reg5
-       .byte   4                               # DW_LLE_offset_pair
-       .uleb128 .Ltmp2-.Lfunc_begin1           #   starting offset
-       .uleb128 .Lfunc_end1-.Lfunc_begin1      #   ending offset
-       .byte   1                               # Loc expr size
-       .byte   80                              # super-register DW_OP_reg0
-       .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   1                               # DW_FORM_addr
-       .byte   85                              # DW_AT_ranges
-       .byte   35                              # DW_FORM_rnglistx
-       .byte   115                             # DW_AT_addr_base
-       .byte   23                              # DW_FORM_sec_offset
-       .byte   116                             # DW_AT_rnglists_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   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   49                              # DW_AT_abstract_origin
-       .byte   19                              # DW_FORM_ref4
-       .byte   0                               # EOM(1)
-       .byte   0                               # EOM(2)
-       .byte   3                               # Abbreviation Code
-       .byte   5                               # DW_TAG_formal_parameter
-       .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   4                               # 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   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   5                               # Abbreviation Code
-       .byte   5                               # DW_TAG_formal_parameter
-       .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   6                               # 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   7                               # 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   8                               # Abbreviation Code
-       .byte   5                               # DW_TAG_formal_parameter
-       .byte   0                               # DW_CHILDREN_no
-       .byte   2                               # DW_AT_location
-       .byte   24                              # DW_FORM_exprloc
-       .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   9                               # 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   85                              # DW_AT_ranges
-       .byte   35                              # DW_FORM_rnglistx
-       .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   10                              # 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:0x93 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
-       .quad   0                               # DW_AT_low_pc
-       .byte   0                               # DW_AT_ranges
-       .long   .Laddr_table_base0              # DW_AT_addr_base
-       .long   .Lrnglists_table_base0          # DW_AT_rnglists_base
-       .long   .Lloclists_table_base0          # DW_AT_loclists_base
-       .byte   2                               # Abbrev [2] 0x2f:0x13 DW_TAG_subprogram
-       .byte   0                               # 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   3                               # Abbrev [3] 0x3b:0x6 DW_TAG_formal_parameter
-       .byte   0                               # DW_AT_location
-       .long   75                              # DW_AT_abstract_origin
-       .byte   0                               # End Of Children Mark
-       .byte   4                               # Abbrev [4] 0x42:0x12 DW_TAG_subprogram
-       .byte   3                               # DW_AT_linkage_name
-       .byte   4                               # DW_AT_name
-       .byte   0                               # DW_AT_decl_file
-       .byte   1                               # DW_AT_decl_line
-       .long   84                              # DW_AT_type
-                                        # DW_AT_external
-                                        # DW_AT_inline
-       .byte   5                               # Abbrev [5] 0x4b:0x8 DW_TAG_formal_parameter
-       .byte   6                               # DW_AT_name
-       .byte   0                               # DW_AT_decl_file
-       .byte   1                               # DW_AT_decl_line
-       .long   84                              # DW_AT_type
-       .byte   0                               # End Of Children Mark
-       .byte   6                               # Abbrev [6] 0x54:0x4 DW_TAG_base_type
-       .byte   5                               # DW_AT_name
-       .byte   5                               # DW_AT_encoding
-       .byte   4                               # DW_AT_byte_size
-       .byte   7                               # Abbrev [7] 0x58:0x38 DW_TAG_subprogram
-       .byte   1                               # 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   7                               # DW_AT_name
-       .byte   0                               # DW_AT_decl_file
-       .byte   5                               # DW_AT_decl_line
-       .long   84                              # DW_AT_type
-                                        # DW_AT_external
-       .byte   8                               # Abbrev [8] 0x67:0xa DW_TAG_formal_parameter
-       .byte   1                               # DW_AT_location
-       .byte   85
-       .byte   8                               # DW_AT_name
-       .byte   0                               # DW_AT_decl_file
-       .byte   5                               # DW_AT_decl_line
-       .long   84                              # DW_AT_type
-       .byte   8                               # Abbrev [8] 0x71:0xa DW_TAG_formal_parameter
-       .byte   1                               # DW_AT_location
-       .byte   84
-       .byte   9                               # DW_AT_name
-       .byte   0                               # DW_AT_decl_file
-       .byte   5                               # DW_AT_decl_line
-       .long   144                             # DW_AT_type
-       .byte   9                               # Abbrev [9] 0x7b:0x14 DW_TAG_inlined_subroutine
-       .long   66                              # DW_AT_abstract_origin
-       .byte   2                               # DW_AT_low_pc
-       .byte 1                               # DW_AT_ranges
-       .byte   0                               # DW_AT_call_file
-       .byte   6                               # DW_AT_call_line
-       .byte   10                              # DW_AT_call_column
-       .byte   3                               # Abbrev [3] 0x88:0x6 DW_TAG_formal_parameter
-       .byte   1                               # DW_AT_location
-       .long   75                              # DW_AT_abstract_origin
-       .byte   0                               # End Of Children Mark
-       .byte   0                               # End Of Children Mark
-       .byte   10                              # Abbrev [10] 0x90:0x5 DW_TAG_pointer_type
-       .long   149                             # DW_AT_type
-       .byte   10                              # Abbrev [10] 0x95:0x5 DW_TAG_pointer_type
-       .long   154                             # DW_AT_type
-       .byte   6                               # Abbrev [6] 0x9a:0x4 DW_TAG_base_type
-       .byte   10                              # 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_rnglists,"",@progbits
-       .long   .Ldebug_list_header_end1-.Ldebug_list_header_start1 # Length
-.Ldebug_list_header_start1:
-       .short  5                               # Version
-       .byte   8                               # Address size
-       .byte   0                               # Segment selector size
-       .long   2                               # Offset entry count
-.Lrnglists_table_base0:
-       .long   .Ldebug_ranges0-.Lrnglists_table_base0
-  .long .Ldebug_ranges1-.Lrnglists_table_base0
-.Ldebug_ranges0:
-       .byte   3                               # DW_RLE_startx_length
-       .byte   0                               #   start index
-       .uleb128 .Lfunc_end0-.Lfunc_begin0      #   length
-       .byte   3                               # DW_RLE_startx_length
-       .byte   1                               #   start index
-       .uleb128 .Lfunc_end1-.Lfunc_begin1      #   length
-       .byte   0                               # DW_RLE_end_of_list
- .Ldebug_ranges1:
-  .byte 0                               # DW_RLE_end_of_list
-.Ldebug_list_header_end1:
-       .section        .debug_str_offsets,"",@progbits
-       .long   48                              # 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  "/home/test" # string offset=143
-.Linfo_string3:
-       .asciz  "_Z6helperi"                    # string offset=181
-.Linfo_string4:
-       .asciz  "helper"                        # string offset=192
-.Linfo_string5:
-       .asciz  "int"                           # string offset=199
-.Linfo_string6:
-       .asciz  "i"                             # string offset=203
-.Linfo_string7:
-       .asciz  "main"                          # string offset=205
-.Linfo_string8:
-       .asciz  "argc"                          # string offset=210
-.Linfo_string9:
-       .asciz  "argv"                          # string offset=215
-.Linfo_string10:
-       .asciz  "char"                          # string offset=220
-       .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
-       .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   .Lfunc_begin0
-       .quad   .Lfunc_begin1
-  .quad 0
-.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/lldb/test/Shell/Commands/dwarf4-low-pc-ranges-inlining.test b/lldb/test/Shell/Commands/dwarf4-low-pc-ranges-inlining.test
deleted file mode 100644 (file)
index d973ceb..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# REQUIRES: system-linux
-
-# RUN: rm -rf %t.dir
-# RUN: mkdir %t.dir
-# RUN: cd %t.dir
-# RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-low-pc-ranges-inlining.s -o %t.dir/main4.o
-# RUN: %clang %t.dir/main4.o -o %t.dir/main4.exe
-# RUN: %lldb -b -o 'b main' %t.dir/main4.exe &> %t.dir/output.txt
-# RUN: cat %t.dir/output.txt | FileCheck %s
-
-# Test checks lldb handles a case of a DIE with DW_AT_low_pc with 0x0 address, and DW_AT_ranges that point to end of list.
-# CHECK-NOT: error: main4.exe
-# CHECK: Breakpoint 1: where
diff --git a/lldb/test/Shell/Commands/dwarf5-low-pc-ranges-inlining.test b/lldb/test/Shell/Commands/dwarf5-low-pc-ranges-inlining.test
deleted file mode 100644 (file)
index 0aeb740..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# REQUIRES: system-linux
-
-# RUN: rm -rf %t.dir
-# RUN: mkdir %t.dir
-# RUN: cd %t.dir
-# RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-low-pc-ranges-inlining.s -o %t.dir/main5.o
-# RUN: %clang %t.dir/main5.o -o %t.dir/main5.exe
-# RUN: %lldb -b -o 'b main' %t.dir/main5.exe &> %t.dir/output.txt
-# RUN: cat %t.dir/output.txt | FileCheck %s
-
-# Test checks lldb handles a case of a DIE with DW_AT_low_pc with 0x0 address, and DW_AT_ranges that point to end of list.
-# CHECK-NOT: error: main5.exe
-# CHECK: Breakpoint 1: where