[Lldb-commits] [lldb] 10d54e2 - [lldb] Attempt to fix dwarf5-debug_line-file-index.s

[Pavel Labath via lldb-commits]

Author: Pavel Labath
Date: 2021-03-22T15:27:25+01:00
New Revision: 10d54e2f8de11e65de8a3fe7e4673ede4d2c82c2

URL: https://github.com/llvm/llvm-project/commit/10d54e2f8de11e65de8a3fe7e4673ede4d2c82c2
DIFF: https://github.com/llvm/llvm-project/commit/10d54e2f8de11e65de8a3fe7e4673ede4d2c82c2.diff

LOG: [lldb] Attempt to fix dwarf5-debug_line-file-index.s

The file contained bogus input - the DIE list was not properly
terminated. This should not cause a crash, but it seems it was crashing
at least on linux arm and x86 windows.

Added: 
    

Modified: 
    lldb/test/Shell/SymbolFile/DWARF/dwarf5-debug_line-file-index.s

Removed: 
    


################################################################################
diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-debug_line-file-index.s b/lldb/test/Shell/SymbolFile/DWARF/dwarf5-debug_line-file-index.s
index f867d466e54b..30aed18ea5ef 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-debug_line-file-index.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/dwarf5-debug_line-file-index.s
@@ -1,5 +1,4 @@
 # Test handling of DWARF5 file index 0.
-# XFAIL: target-arm && linux-gnu
 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -o %t -triple x86_64-pc-linux %s
@@ -18,7 +17,7 @@
 	.section	.debug_abbrev,"", at progbits
 	.byte	1                               # Abbreviation Code
 	.byte	17                              # DW_TAG_compile_unit
-	.byte	1                               # DW_CHILDREN_yes
+	.byte	1                               # DW_CHILDREN_no
 	.byte	37                              # DW_AT_producer
 	.byte	37                              # DW_FORM_strx1
 	.byte	19                              # DW_AT_language
@@ -39,38 +38,6 @@
 	.byte	23                              # DW_FORM_sec_offset
 	.byte	0                               # EOM(1)
 	.byte	0                               # EOM(2)
-	.byte	2                               # 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	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	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	0                               # EOM(3)
 	.section	.debug_info,"", at progbits
 .Lcu_begin0:
@@ -92,7 +59,7 @@
 	.long	.Laddr_table_base0              # DW_AT_addr_base
 .Ldebug_info_end0:
 	.section	.debug_str_offsets,"", at progbits
-	.long	24                              # Length of String Offsets Set
+	.long	12                              # Length of String Offsets Set
 	.short	5
 	.short	0
 .Lstr_offsets_base0: