This is an archive of the discontinued LLVM Phabricator instance.

Differential D130335

[BOLT][DWARF] Fix bolt/test/X86/shared-abbrev.s
ClosedPublic

Authored by zr33 on Jul 22 2022, 12:22 AM.

Details

Reviewers
rafauler
Amir
maksfb
ayermolo
Commits
rGa2035c566f5d: [BOLT][DWARF] Fix bolt/test/X86/shared-abbrev.s
Summary

There should not be a end of child mark before DW_AT_ranges, removed it and fixed unit offset.

Diff Detail

Event Timeline

zr33 created this revision.Jul 22 2022, 12:22 AM
Herald added a reviewer: rafauler. · View Herald TranscriptJul 22 2022, 12:22 AM
Herald added a reviewer: Amir. · View Herald Transcript
Herald added a reviewer: maksfb. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: jsji, ayermolo. · View Herald Transcript
zr33 requested review of this revision.Jul 22 2022, 12:22 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 22 2022, 12:22 AM
Herald added subscribers: llvm-commits, yota9. · View Herald Transcript
zr33 retitled this revision from remove end of child mark and fix unit offset bolt/test/X86/shared-abbrev.s to [BOLT][DWARF] fix bolt/test/X86/shared-abbrev.s.Jul 22 2022, 12:24 AM
zr33 edited the summary of this revision. (Show Details)
zr33 added a reviewer: ayermolo.
Harbormaster completed remote builds in B176939: Diff 446731.Jul 22 2022, 12:28 AM
ayermolo accepted this revision.Jul 22 2022, 7:25 AM

Thanks for fixing it. I think I modified this assembly manually, and missed this.

This revision is now accepted and ready to land.Jul 22 2022, 7:25 AM
ayermolo retitled this revision from [BOLT][DWARF] fix bolt/test/X86/shared-abbrev.s to [BOLT][DWARF] Fix bolt/test/X86/shared-abbrev.s.Jul 22 2022, 10:44 AM
ayermolo edited the summary of this revision. (Show Details)
Closed by commit rGa2035c566f5d: [BOLT][DWARF] Fix bolt/test/X86/shared-abbrev.s (authored by zr33, committed by ayermolo). · Explain WhyJul 22 2022, 10:46 AM
This revision was automatically updated to reflect the committed changes.
ayermolo added a commit: rGa2035c566f5d: [BOLT][DWARF] Fix bolt/test/X86/shared-abbrev.s.
ayermolo mentioned this in D130046: [DWP][DWARF] Detect and error on debug info offset overflow.Jul 22 2022, 10:50 AM

Revision Contents

PathSize
bolt/
test/
X86/
6 lines

Diff 446903

bolt/test/X86/shared-abbrev.s

# RUN: rm -rf %t # RUN: rm -rf %t
# RUN: mkdir %t # RUN: mkdir %t
# RUN: llvm-mc -filetype=obj -triple=x86_64 -dwarf-version=4 %s -o %t/shared-abbrev.o # RUN: llvm-mc -filetype=obj -triple=x86_64 -dwarf-version=4 %s -o %t/shared-abbrev.o
# RUN: %clang %cflags %t/shared-abbrev.o -o %t/shared-abbrev.exe # RUN: %clang %cflags %t/shared-abbrev.o -o %t/shared-abbrev.exe
# RUN: llvm-bolt %t/shared-abbrev.exe -o %t/shared-abbrev.exe.bolt --update-debug-sections # RUN: llvm-bolt %t/shared-abbrev.exe -o %t/shared-abbrev.exe.bolt --update-debug-sections
# RUN: llvm-dwarfdump --debug-info %t/shared-abbrev.exe.bolt | FileCheck %s # RUN: llvm-dwarfdump --debug-info %t/shared-abbrev.exe.bolt | FileCheck %s
# CHECK: 0x00000000: # CHECK: 0x00000000:
# CHECK-SAME: abbr_offset = 0x0000 # CHECK-SAME: abbr_offset = 0x0000
# CHECK-EMPTY: # CHECK-EMPTY:
# CHECK-NEXT: DW_TAG_compile_unit # CHECK-NEXT: DW_TAG_compile_unit
# CHECK-NEXT: DW_AT_stmt_list # CHECK-NEXT: DW_AT_stmt_list
# CHECK-NEXT: DW_AT_low_pc # CHECK-NEXT: DW_AT_low_pc
# CHECK-NEXT: DW_AT_ranges # CHECK-NEXT: DW_AT_ranges
# CHECK: 0x0000001d: # CHECK: 0x0000001c:
# CHECK-SAME: abbr_offset = 0x0017 # CHECK-SAME: abbr_offset = 0x0017
# CHECK-EMPTY: # CHECK-EMPTY:
# CHECK: DW_TAG_compile_unit # CHECK: DW_TAG_compile_unit
# CHECK-NEXT: DW_AT_stmt_list # CHECK-NEXT: DW_AT_stmt_list
# CHECK-NEXT: DW_AT_low_pc # CHECK-NEXT: DW_AT_low_pc
# CHECK-NEXT: DW_AT_ranges # CHECK-NEXT: DW_AT_ranges
# CHECK: 0x0000003a: # CHECK: 0x00000039:
# CHECK-SAME: abbr_offset = 0x0000 # CHECK-SAME: abbr_offset = 0x0000
# CHECK-EMPTY: # CHECK-EMPTY:
# CHECK-NEXT: DW_TAG_compile_unit # CHECK-NEXT: DW_TAG_compile_unit
# CHECK-NEXT: DW_AT_stmt_list # CHECK-NEXT: DW_AT_stmt_list
# CHECK-NEXT: DW_AT_low_pc # CHECK-NEXT: DW_AT_low_pc
# CHECK-NEXT: DW_AT_ranges # CHECK-NEXT: DW_AT_ranges
.text .text
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines.Lcu_begin0:
.long .Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit .long .Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit
.Ldebug_info_start0: .Ldebug_info_start0:
.short 4 # DWARF version number .short 4 # DWARF version number
.long .debug_abbrev # Offset Into Abbrev. Section .long .debug_abbrev # Offset Into Abbrev. Section
.byte 8 # Address Size (in bytes) .byte 8 # Address Size (in bytes)
.byte 2 # Abbrev [2] DW_TAG_compile_unit .byte 2 # Abbrev [2] DW_TAG_compile_unit
.long .Lline_table_start0 # DW_AT_stmt_list .long .Lline_table_start0 # DW_AT_stmt_list
.quad 0 # DW_AT_low_pc .quad 0 # DW_AT_low_pc
.byte 0 # End Of Children Mark
.long .Ldebug_ranges0 # DW_AT_ranges --- end manual -- .long .Ldebug_ranges0 # DW_AT_ranges --- end manual --
.Ldebug_info_end0: .Ldebug_info_end0:
# Second CU table. # Second CU table.
.long .Ldebug_info_end1-.Ldebug_info_start1 # Length of Unit .long .Ldebug_info_end1-.Ldebug_info_start1 # Length of Unit
.Ldebug_info_start1: .Ldebug_info_start1:
.short 4 # DWARF version number .short 4 # DWARF version number
.long .debug_abbrev # Offset Into Abbrev. Section .long .debug_abbrev # Offset Into Abbrev. Section
Show All 9 Lines.Ldebug_info_end1:
.long .Ldebug_info_end2-.Ldebug_info_start2 # Length of Unit .long .Ldebug_info_end2-.Ldebug_info_start2 # Length of Unit
.Ldebug_info_start2: .Ldebug_info_start2:
.short 4 # DWARF version number .short 4 # DWARF version number
.long .debug_abbrev # Offset Into Abbrev. Section .long .debug_abbrev # Offset Into Abbrev. Section
.byte 8 # Address Size (in bytes) .byte 8 # Address Size (in bytes)
.byte 2 # Abbrev [2] DW_TAG_compile_unit .byte 2 # Abbrev [2] DW_TAG_compile_unit
.long .Lline_table_start0 # DW_AT_stmt_list .long .Lline_table_start0 # DW_AT_stmt_list
.quad 0 # DW_AT_low_pc .quad 0 # DW_AT_low_pc
.byte 0 # End Of Children Mark
.long .Ldebug_ranges0 # DW_AT_ranges --- end manual -- .long .Ldebug_ranges0 # DW_AT_ranges --- end manual --
.Ldebug_info_end2: .Ldebug_info_end2:
.section .debug_ranges,"",@progbits .section .debug_ranges,"",@progbits
.Ldebug_ranges0: .Ldebug_ranges0:
.quad .Lfunc_begin0 .quad .Lfunc_begin0
.quad .Lfunc_end0 .quad .Lfunc_end0
.quad .Lfunc_begin0 .quad .Lfunc_begin0
.quad .Lfunc_end0 .quad .Lfunc_end0
.quad 0 .quad 0
.quad 0 .quad 0
.section ".note.GNU-stack","",@progbits .section ".note.GNU-stack","",@progbits
.addrsig .addrsig
.section .debug_line,"",@progbits .section .debug_line,"",@progbits
.Lline_table_start0: .Lline_table_start0: