[DWARF] Refactor test to remove relocations for DWO

[ayermolo]

Summary

The way this test generates object file results in relocation sections for .dwo sections. This is not legal. Re-wrote it to avoid those relocation sections.

[dblaikie]

llvm/test/DebugInfo/X86/dwarfdump-header.s

24

Don't think there's a need to add the '.' at the start here in these labels? (leave it out like other labels above, etc?)

430

That doesn't look right, does it? 0x25 would be too large an index for the .debug_str_offsets.dwo section - there are only 5 things in there, so the valid indexes should be [0, 4], I think?

[ayermolo]

llvm/test/DebugInfo/X86/dwarfdump-header.s

430

This is encoding for DW_FORM_strx1.
0xe --> HANDLE_DW_FORM(0x0e, strp, 2, DWARF)
0x25 --> HANDLE_DW_FORM(0x25, strx1, 5, DWARF)

At least this is my understanding of what is happening here looking at comments and value of original .byte

[dblaikie]

Sounds good, thanks!

llvm/test/DebugInfo/X86/dwarfdump-header.s

430

Oh, sorry - this is the abbreviation rather than the values, right right. Sorry about that.

[ayermolo]

updated labels

[ayermolo]

llvm/test/DebugInfo/X86/dwarfdump-header.s

24

Ah good catch. Was following example of other test, but it's different in this one.

llvm/test/DebugInfo/X86/dwarfdump-header.s

 str_TU_4:
         .asciz "V4_type_unit"
 str_LT_5a:
         .asciz "Directory5a"
 str_LT_5b:
         .asciz "Directory5b"
 
         .section .debug_str.dwo,"MSe",@progbits,1
 dwo_TU_5:
         .asciz "V5_split_type_unit"
 dwo_producer:
         .asciz "Handmade DWO producer"
 dwo_CU_5:
         .asciz "V5_dwo_compile_unit"
 dwo_LT_5a:
         .asciz "DWODirectory5a"
 dwo_LT_5b:
         .asciz "DWODirectory5b"
 
+        .section  .debug_str_offsets.dwo,"e",@progbits
+        .long Lstr_offsets_end-Lstr_offsets_start                              # Length of String Offsets Set
+        Lstr_offsets_start:
+  .short  5
+  .short  0
+  .long dwo_TU_5-.debug_str.dwo
+  .long dwo_producer-.debug_str.dwo
+  .long dwo_CU_5-.debug_str.dwo
+  .long dwo_LT_5a-.debug_str.dwo
+  .long dwo_LT_5b-.debug_str.dwo
+        Lstr_offsets_end:
+
 # All CUs/TUs use the same abbrev section for simplicity.
         .section .debug_abbrev,"",@progbits
         .byte 0x01  # Abbrev code
         .byte 0x11  # DW_TAG_compile_unit
         .byte 0x00  # DW_CHILDREN_no
         .byte 0x25  # DW_AT_producer
         .byte 0x0e  # DW_FORM_strp
         .byte 0x03  # DW_AT_name
# All CUs/TUs use the same abbrev section for simplicity.
         .byte 0x00  # EOM(3)
 
 # And a .dwo copy for the .dwo sections.
         .section .debug_abbrev.dwo,"e",@progbits
         .byte 0x01  # Abbrev code
         .byte 0x11  # DW_TAG_compile_unit
         .byte 0x00  # DW_CHILDREN_no
         .byte 0x25  # DW_AT_producer
-        .byte 0x0e  # DW_FORM_strp
+        .byte 0x25  # DW_FORM_strx1
         .byte 0x03  # DW_AT_name
-        .byte 0x0e  # DW_FORM_strp
+        .byte 0x25  # DW_FORM_strx1
         .byte 0x10  # DW_AT_stmt_list
         .byte 0x17  # DW_FORM_sec_offset
         .byte 0x00  # EOM(1)
         .byte 0x00  # EOM(2)
         .byte 0x02  # Abbrev code
         .byte 0x41  # DW_TAG_type_unit
         .byte 0x01  # DW_CHILDREN_yes
         .byte 0x03  # DW_AT_name
-        .byte 0x0e  # DW_FORM_strp
+        .byte 0x25  # DW_FORM_strx1
         .byte 0x00  # EOM(1)
         .byte 0x00  # EOM(2)
         .byte 0x03  # Abbrev code
         .byte 0x13  # DW_TAG_structure_type
         .byte 0x00  # DW_CHILDREN_no (no members)
         .byte 0x03  # DW_AT_name
-        .byte 0x0e  # DW_FORM_strp
+        .byte 0x25  # DW_FORM_strx1
         .byte 0x00  # EOM(1)
         .byte 0x00  # EOM(2)
         .byte 0x00  # EOM(3)
 
         .section .debug_info,"",@progbits
 # CHECK-LABEL: .debug_info contents:
 
 # DWARF v4 CU header. V4 CU headers all look the same so we do only one.

 # CHECK-LABEL: .debug_info.dwo
 
 # DWARF v5 split CU header.
         .long  CU_split_5_end-CU_split_5_version # Length of Unit
 CU_split_5_version:
         .short 5                # DWARF version number
         .byte 5                 # DWARF Unit Type
         .byte 8                 # Address Size (in bytes)
-        .long .debug_abbrev.dwo # Offset Into Abbrev. Section
+        .long 0 # Offset Into Abbrev. Section
         .quad 0x5a              # DWO ID
 # The split compile-unit DIE, with DW_AT_producer, DW_AT_name, DW_AT_stmt_list.
         .byte 1
-        .long dwo_producer
-        .long dwo_CU_5
-        .long dwo_LH_5_start
+        .byte 1
+        .byte 2
+        .long 0
         .byte 0 # NULL
 CU_split_5_end:
 
-# CHECK: 0x00000000: Compile Unit: length = 0x0000001e, format = DWARF32, version = 0x0005, unit_type = DW_UT_split_compile, abbr_offset = 0x0000, addr_size = 0x08, DWO_id = 0x000000000000005a (next unit at 0x00000022)
+# CHECK: 0x00000000: Compile Unit: length = 0x00000018, format = DWARF32, version = 0x0005, unit_type = DW_UT_split_compile, abbr_offset = 0x0000, addr_size = 0x08, DWO_id = 0x000000000000005a (next unit at 0x0000001c)
 # CHECK: 0x00000014: DW_TAG_compile_unit
 # CHECK-NEXT: DW_AT_producer {{.*}} "Handmade DWO producer"
 # CHECK-NEXT: DW_AT_name {{.*}} "V5_dwo_compile_unit"
 
 # Now a DWARF v5 type unit, which goes in a .debug_info.dwo comdat.
 # Note there will not be another ".debug_info.dwo contents:" line, even though
 # there is a separate ELF section header; it's dumped along with the previous
 # unit as if they were in a single section.
 
         .section .debug_info.dwo,"Ge",@progbits,5555,comdat
 # CHECK-NOT: .debug_info.dwo
 
 # DWARF v5 split type unit header.
 TU_split_5_start:
         .long  TU_split_5_end-TU_split_5_version  # Length of Unit
 TU_split_5_version:
         .short 5               # DWARF version number
         .byte 6                # DWARF Unit Type
         .byte 8                # Address Size (in bytes)
-        .long .debug_abbrev.dwo    # Offset Into Abbrev. Section
+        .long 0    # Offset Into Abbrev. Section
         .quad 0x8899aabbccddeeff # Type Signature
         .long TU_split_5_type-TU_split_5_start  # Type offset
 # The type-unit DIE, which has a name.
         .byte 2
-        .long dwo_TU_5
+        .byte 0
 # The type DIE, which has a name.
 TU_split_5_type:
         .byte 3
-        .long dwo_TU_5
+        .byte 0
         .byte 0 # NULL
         .byte 0 # NULL
 TU_split_5_end:
 
-# CHECK: 0x00000000: Type Unit: length = 0x00000020, format = DWARF32, version = 0x0005, unit_type = DW_UT_split_type, abbr_offset = 0x0000, addr_size = 0x08, name = 'V5_split_type_unit', type_signature = 0x8899aabbccddeeff, type_offset = 0x001d (next unit at 0x00000024)
+# CHECK: 0x00000000: Type Unit: length = 0x0000001a, format = DWARF32, version = 0x0005, unit_type = DW_UT_split_type, abbr_offset = 0x0000, addr_size = 0x08, name = 'V5_split_type_unit', type_signature = 0x8899aabbccddeeff, type_offset = 0x001a (next unit at 0x0000001e)
 # CHECK: 0x00000018: DW_TAG_type_unit
 
         .section .debug_types,"",@progbits
 # CHECK-LABEL: .debug_types contents:
 
 # DWARF v4 Type unit header. Normal/split are identical so we do only one.
 TU_4_start:
         .long  TU_4_end-TU_4_version  # Length of Unit
dwo_LH_5_params:
         .byte   0
         .byte   1
         .byte   0
         .byte   0
         .byte   1
         # Directory table format
         .byte   1               # One element per directory entry
         .byte   1               # DW_LNCT_path
-        .byte   0x0e            # DW_FORM_strp (-> .debug_str.dwo)
+        .byte   0x25            # DW_FORM_strx1 (-> .debug_str.dwo)
         # Directory table entries
         .byte   2               # Two directories
-        .long   dwo_LT_5a
-        .long   dwo_LT_5b
+        .byte   3
+        .byte   4
         # File table format
         .byte   4               # Four elements per file entry
         .byte   1               # DW_LNCT_path
         .byte   0x08            # DW_FORM_string
         .byte   2               # DW_LNCT_directory_index
         .byte   0x0b            # DW_FORM_data1
         .byte   3               # DW_LNCT_timestamp
         .byte   0x0f            # DW_FORM_udata
dwo_LH_5_header_end:
         # Line number program, which is empty.
 dwo_LH_5_end:
 
 # CHECK: Line table prologue:
 # CHECK: version: 5
 # CHECK: address_size: 8
 # CHECK: seg_select_size: 0
 # CHECK: max_ops_per_inst: 1
-# CHECK: include_directories[  0] = .debug_str[0x0000003d] = "DWODirectory5a"
-# CHECK: include_directories[  1] = .debug_str[0x0000004c] = "DWODirectory5b"
+# CHECK: include_directories[  0] = indexed (00000003) string = "DWODirectory5a"
+# CHECK: include_directories[  1] = indexed (00000004) string = "DWODirectory5b"
 # CHECK-NOT: include_directories
 # CHECK: file_names[  0]:
 # CHECK-NEXT: name: "DWOFile5a"
 # CHECK-NEXT: dir_index: 0
 # CHECK-NEXT: mod_time: 0x00000015
 # CHECK-NEXT: length: 0x00000025
 # CHECK: file_names[  1]:
 # CHECK-NEXT: name: "DWOFile5b"
 # CHECK-NEXT: dir_index: 1
 # CHECK-NEXT: mod_time: 0x00000035
 # CHECK-NEXT: length: 0x00000045
 # CHECK-NOT: file_names
 
 # VERIFY: Verifying .debug_types
 # VERIFY: No errors.