Skip to content

[BOLT][DWWARF] Fix foreign TU index with local TUs #84594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 11, 2024
Merged

[BOLT][DWWARF] Fix foreign TU index with local TUs #84594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion bolt/lib/Core/DebugNames.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,13 @@ void DWARF5AcceleratorTable::finalize() {
std::optional<DWARF5AccelTable::UnitIndexAndEncoding>
DWARF5AcceleratorTable::getIndexForEntry(
const BOLTDWARF5AccelTableData &Value) const {
// The foreign TU list immediately follows the local TU list and they both
// use the same index, so that if there are N local TU entries, the index for
// the first foreign TU is N.
if (Value.isTU())
return {{Value.getUnitID(), {dwarf::DW_IDX_type_unit, TUIndexForm}}};
return {{(Value.getSecondUnitID() ? (unsigned)LocalTUList.size() : 0) +
Value.getUnitID(),
{dwarf::DW_IDX_type_unit, TUIndexForm}}};
if (CUList.size() > 1)
return {{Value.getUnitID(), {dwarf::DW_IDX_compile_unit, CUIndexForm}}};
return std::nullopt;
Expand Down
314 changes: 314 additions & 0 deletions bolt/test/X86/Inputs/dwarf5-debug-names-ftu-ltu-mix-helper.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,314 @@
# struct AMono {
# int x;
# };
#
# AMono globalMono;
# # clang++ -g2 -gdwarf-5 -gpubnames -S -fdebug-types-section -o

.text
.file "helper.cpp"
.file 0 "/home" "helper.cpp" md5 0x3c0ac73d7b074961c6e8202230a76228
.section .debug_info,"G",@progbits,6412503741467814911,comdat
.Ltu_begin0:
.long .Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit
.Ldebug_info_start0:
.short 5 # DWARF version number
.byte 2 # DWARF Unit Type
.byte 8 # Address Size (in bytes)
.long .debug_abbrev # Offset Into Abbrev. Section
.quad 6412503741467814911 # Type Signature
.long 35 # Type DIE Offset
.byte 1 # Abbrev [1] 0x18:0x20 DW_TAG_type_unit
.short 33 # DW_AT_language
.long .Lline_table_start0 # DW_AT_stmt_list
.long .Lstr_offsets_base0 # DW_AT_str_offsets_base
.byte 2 # Abbrev [2] 0x23:0x10 DW_TAG_structure_type
.byte 5 # DW_AT_calling_convention
.byte 6 # DW_AT_name
.byte 4 # DW_AT_byte_size
.byte 0 # DW_AT_decl_file
.byte 1 # DW_AT_decl_line
.byte 3 # Abbrev [3] 0x29:0x9 DW_TAG_member
.byte 4 # DW_AT_name
.long 51 # DW_AT_type
.byte 0 # DW_AT_decl_file
.byte 2 # DW_AT_decl_line
.byte 0 # DW_AT_data_member_location
.byte 0 # End Of Children Mark
.byte 4 # Abbrev [4] 0x33:0x4 DW_TAG_base_type
.byte 5 # DW_AT_name
.byte 5 # DW_AT_encoding
.byte 4 # DW_AT_byte_size
.byte 0 # End Of Children Mark
.Ldebug_info_end0:
.type globalMono,@object # @globalMono
.bss
.globl globalMono
.p2align 2, 0x0
globalMono:
.zero 4
.size globalMono, 4

.section .debug_abbrev,"",@progbits
.byte 1 # Abbreviation Code
.byte 65 # DW_TAG_type_unit
.byte 1 # DW_CHILDREN_yes
.byte 19 # DW_AT_language
.byte 5 # DW_FORM_data2
.byte 16 # DW_AT_stmt_list
.byte 23 # DW_FORM_sec_offset
.byte 114 # DW_AT_str_offsets_base
.byte 23 # DW_FORM_sec_offset
.byte 0 # EOM(1)
.byte 0 # EOM(2)
.byte 2 # Abbreviation Code
.byte 19 # DW_TAG_structure_type
.byte 1 # DW_CHILDREN_yes
.byte 54 # DW_AT_calling_convention
.byte 11 # DW_FORM_data1
.byte 3 # DW_AT_name
.byte 37 # DW_FORM_strx1
.byte 11 # DW_AT_byte_size
.byte 11 # DW_FORM_data1
.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 3 # Abbreviation Code
.byte 13 # DW_TAG_member
.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 56 # DW_AT_data_member_location
.byte 11 # DW_FORM_data1
.byte 0 # EOM(1)
.byte 0 # EOM(2)
.byte 4 # 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 5 # 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 115 # DW_AT_addr_base
.byte 23 # DW_FORM_sec_offset
.byte 0 # EOM(1)
.byte 0 # EOM(2)
.byte 6 # 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 7 # Abbreviation Code
.byte 19 # DW_TAG_structure_type
.byte 0 # DW_CHILDREN_no
.byte 60 # DW_AT_declaration
.byte 25 # DW_FORM_flag_present
.byte 105 # DW_AT_signature
.byte 32 # DW_FORM_ref_sig8
.byte 0 # EOM(1)
.byte 0 # EOM(2)
.byte 0 # EOM(3)
.section .debug_info,"",@progbits
.Lcu_begin0:
.long .Ldebug_info_end1-.Ldebug_info_start1 # Length of Unit
.Ldebug_info_start1:
.short 5 # DWARF version number
.byte 1 # DWARF Unit Type
.byte 8 # Address Size (in bytes)
.long .debug_abbrev # Offset Into Abbrev. Section
.byte 5 # Abbrev [5] 0xc:0x27 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
.long .Laddr_table_base0 # DW_AT_addr_base
.byte 6 # Abbrev [6] 0x1e:0xb DW_TAG_variable
.byte 3 # DW_AT_name
.long 41 # DW_AT_type
# DW_AT_external
.byte 0 # DW_AT_decl_file
.byte 5 # DW_AT_decl_line
.byte 2 # DW_AT_location
.byte 161
.byte 0
.byte 7 # Abbrev [7] 0x29:0x9 DW_TAG_structure_type
# DW_AT_declaration
.quad 6412503741467814911 # DW_AT_signature
.byte 0 # End Of Children Mark
.Ldebug_info_end1:
.section .debug_str_offsets,"",@progbits
.long 32 # Length of String Offsets Set
.short 5
.short 0
.Lstr_offsets_base0:
.section .debug_str,"MS",@progbits,1
.Linfo_string0:
.asciz "clang version 19.0.0git ([email protected]:llvm/llvm-project.git ced1fac8a32e35b63733bda27c7f5b9a2b635403)" # string offset=0
.Linfo_string1:
.asciz "helper.cpp" # string offset=104
.Linfo_string2:
.asciz "/home" # string offset=115
.Linfo_string3:
.asciz "globalMono" # string offset=153
.Linfo_string4:
.asciz "AMono" # string offset=164
.Linfo_string5:
.asciz "x" # string offset=170
.Linfo_string6:
.asciz "int" # string offset=172
.section .debug_str_offsets,"",@progbits
.long .Linfo_string0
.long .Linfo_string1
.long .Linfo_string2
.long .Linfo_string3
.long .Linfo_string5
.long .Linfo_string6
.long .Linfo_string4
.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 globalMono
.Ldebug_addr_end0:
.section .debug_names,"",@progbits
.long .Lnames_end0-.Lnames_start0 # Header: unit length
.Lnames_start0:
.short 5 # Header: version
.short 0 # Header: padding
.long 1 # Header: compilation unit count
.long 1 # Header: local type unit count
.long 0 # Header: foreign type unit count
.long 3 # Header: bucket count
.long 3 # Header: name count
.long .Lnames_abbrev_end0-.Lnames_abbrev_start0 # Header: abbreviation table size
.long 8 # Header: augmentation string size
.ascii "LLVM0700" # Header: augmentation string
.long .Lcu_begin0 # Compilation unit 0
.long .Ltu_begin0 # Type unit 0
.long 0 # Bucket 0
.long 0 # Bucket 1
.long 1 # Bucket 2
.long 193495088 # Hash in Bucket 2
.long 253228319 # Hash in Bucket 2
.long -857151761 # Hash in Bucket 2
.long .Linfo_string6 # String in Bucket 2: int
.long .Linfo_string4 # String in Bucket 2: AMono
.long .Linfo_string3 # String in Bucket 2: globalMono
.long .Lnames1-.Lnames_entries0 # Offset in Bucket 2
.long .Lnames0-.Lnames_entries0 # Offset in Bucket 2
.long .Lnames2-.Lnames_entries0 # Offset in Bucket 2
.Lnames_abbrev_start0:
.byte 1 # Abbrev code
.byte 36 # DW_TAG_base_type
.byte 2 # DW_IDX_type_unit
.byte 11 # DW_FORM_data1
.byte 3 # DW_IDX_die_offset
.byte 19 # DW_FORM_ref4
.byte 4 # DW_IDX_parent
.byte 25 # DW_FORM_flag_present
.byte 0 # End of abbrev
.byte 0 # End of abbrev
.byte 2 # Abbrev code
.byte 19 # DW_TAG_structure_type
.byte 2 # DW_IDX_type_unit
.byte 11 # DW_FORM_data1
.byte 3 # DW_IDX_die_offset
.byte 19 # DW_FORM_ref4
.byte 4 # DW_IDX_parent
.byte 25 # DW_FORM_flag_present
.byte 0 # End of abbrev
.byte 0 # End of abbrev
.byte 3 # Abbrev code
.byte 19 # DW_TAG_structure_type
.byte 3 # DW_IDX_die_offset
.byte 19 # DW_FORM_ref4
.byte 4 # DW_IDX_parent
.byte 25 # DW_FORM_flag_present
.byte 0 # End of abbrev
.byte 0 # End of abbrev
.byte 4 # Abbrev code
.byte 52 # DW_TAG_variable
.byte 3 # DW_IDX_die_offset
.byte 19 # DW_FORM_ref4
.byte 4 # DW_IDX_parent
.byte 25 # DW_FORM_flag_present
.byte 0 # End of abbrev
.byte 0 # End of abbrev
.byte 0 # End of abbrev list
.Lnames_abbrev_end0:
.Lnames_entries0:
.Lnames1:
.L1:
.byte 1 # Abbreviation code
.byte 0 # DW_IDX_type_unit
.long 51 # DW_IDX_die_offset
.byte 0 # DW_IDX_parent
# End of list: int
.Lnames0:
.L2:
.byte 2 # Abbreviation code
.byte 0 # DW_IDX_type_unit
.long 35 # DW_IDX_die_offset
.L3: # DW_IDX_parent
.byte 3 # Abbreviation code
.long 41 # DW_IDX_die_offset
.byte 0 # DW_IDX_parent
# End of list: AMono
.Lnames2:
.L0:
.byte 4 # Abbreviation code
.long 30 # DW_IDX_die_offset
.byte 0 # DW_IDX_parent
# End of list: globalMono
.p2align 2, 0x0
.Lnames_end0:
.ident "clang version 19.0.0git ([email protected]:llvm/llvm-project.git ced1fac8a32e35b63733bda27c7f5b9a2b635403)"
.section ".note.GNU-stack","",@progbits
.addrsig
.section .debug_line,"",@progbits
.Lline_table_start0:
Loading