This is an archive of the discontinued LLVM Phabricator instance.

Differential D114892

[llvm-dwarfdump] Do not print preceding :: for local types
ClosedPublic

Authored by krisb on Dec 1 2021, 10:59 AM.

Details

Reviewers
dblaikie
jhenderson
jdoerfert
Commits
rG0bf2c87785f3: [llvm-dwarfdump] Do not print preceding :: for local types

Diff Detail

Event Timeline

krisb created this revision.Dec 1 2021, 10:59 AM
Herald added a reviewer: jhenderson. · View Herald TranscriptDec 1 2021, 10:59 AM
Herald added subscribers: cmtice, hiraditya. · View Herald Transcript
krisb requested review of this revision.Dec 1 2021, 10:59 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptDec 1 2021, 10:59 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, sstefan1, MaskRay. · View Herald Transcript
krisb mentioned this in D113741: [RFC][DwarfDebug][AsmPrinter] Support emitting function-local declaration for a lexical block.Dec 1 2021, 11:02 AM
dblaikie accepted this revision.Dec 1 2021, 11:37 AM

Looks good, thanks!

This revision is now accepted and ready to land.Dec 1 2021, 11:37 AM
Harbormaster completed remote builds in B136964: Diff 391081.Dec 1 2021, 12:13 PM
jhenderson added a comment.Dec 2 2021, 12:41 AM

The patch is more about testing generic DebugInfo behaviour, rather than anything specific to llvm-dwarfdump. I wonder if the test would make more sense there? No strong feelings on that though.

krisb added a comment.Dec 2 2021, 3:50 AM
In D114892#3166220, @jhenderson wrote:

The patch is more about testing generic DebugInfo behaviour, rather than anything specific to llvm-dwarfdump. I wonder if the test would make more sense there? No strong feelings on that though.

I placed the test into the same directory as the original llvm/test/tools/llvm-dwarfdump/X86/prettyprint_types.s, so if to change the directory it should be done for both tests, I think.
If so, I can move both tests in a separate NFC patch, but since there is no strong opinion on where to place these tests, I think this is up to @dblaikie.

dblaikie added a subscriber: probinson.Dec 2 2021, 11:06 AM
In D114892#3166220, @jhenderson wrote:

The patch is more about testing generic DebugInfo behaviour, rather than anything specific to llvm-dwarfdump. I wonder if the test would make more sense there? No strong feelings on that though.

This comes back to the complication of debug info testing - llvm/test/DebugInfo has ended up as more a place for testing CodeGen/AsmPrinter - debug info generation, though, yeah, that's non-obvious. @probinson did point this out a while back that maybe the LLVM codegen tests should be moved into a different directory so llvm/test/DebugInfo could be used for testing libDebugInfo - and generally it was decided not to do that. I may have second thoughts on that, but generally I'd prefer pure libDebugInfoDWARF testing happen in llvm/test/tools/llvm-dwarfdump (& llvm/test/tools/llvm-symbolizer, etc) for now/these days unless we're going to move the codegen testing out of llvm/test/DebugInfo.

jhenderson accepted this revision.Dec 3 2021, 12:37 AM
In D114892#3167540, @dblaikie wrote:
In D114892#3166220, @jhenderson wrote:

The patch is more about testing generic DebugInfo behaviour, rather than anything specific to llvm-dwarfdump. I wonder if the test would make more sense there? No strong feelings on that though.

This comes back to the complication of debug info testing - llvm/test/DebugInfo has ended up as more a place for testing CodeGen/AsmPrinter - debug info generation, though, yeah, that's non-obvious. @probinson did point this out a while back that maybe the LLVM codegen tests should be moved into a different directory so llvm/test/DebugInfo could be used for testing libDebugInfo - and generally it was decided not to do that. I may have second thoughts on that, but generally I'd prefer pure libDebugInfoDWARF testing happen in llvm/test/tools/llvm-dwarfdump (& llvm/test/tools/llvm-symbolizer, etc) for now/these days unless we're going to move the codegen testing out of llvm/test/DebugInfo.

Okay, fair enough. Personal opinion is that there should be a one-to-one mapping between libraries/tools and test directories, which matches @probinson's points, but llvm-dwarfdump is as good as anywhere for this now, I guess (even ignoring the pre-existing test already mentioned).

This revision was landed with ongoing or failed builds.Dec 3 2021, 2:28 AM
Closed by commit rG0bf2c87785f3: [llvm-dwarfdump] Do not print preceding :: for local types (authored by krisb). · Explain Why
This revision was automatically updated to reflect the committed changes.
krisb added a commit: rG0bf2c87785f3: [llvm-dwarfdump] Do not print preceding :: for local types.

Revision Contents

PathSize
llvm/
lib/
DebugInfo/
DWARF/
2 lines
test/
tools/
llvm-dwarfdump/
X86/
239 lines

Diff 391589

llvm/lib/DebugInfo/DWARF/DWARFDie.cpp

Show First 20 Lines • Show All 666 Lines • ▼ Show 20 Lines void appendScopes(DWARFDie D) {
if (D.getTag() == DW_TAG_compile_unit) if (D.getTag() == DW_TAG_compile_unit)
return; return;
if (D.getTag() == DW_TAG_type_unit) if (D.getTag() == DW_TAG_type_unit)
return; return;
if (D.getTag() == DW_TAG_skeleton_unit) if (D.getTag() == DW_TAG_skeleton_unit)
return; return;
if (D.getTag() == DW_TAG_subprogram) if (D.getTag() == DW_TAG_subprogram)
return; return;
if (D.getTag() == DW_TAG_lexical_block)
return;
D = D.resolveTypeUnitReference(); D = D.resolveTypeUnitReference();
if (DWARFDie P = D.getParent()) if (DWARFDie P = D.getParent())
appendScopes(P); appendScopes(P);
appendUnqualifiedName(D); appendUnqualifiedName(D);
OS << "::"; OS << "::";
} }
}; };
} // anonymous namespace } // anonymous namespace
▲ Show 20 Lines • Show All 583 Lines • Show Last 20 Lines

llvm/test/tools/llvm-dwarfdump/X86/prettyprint_local_types.s

  • This file was added.
# RUN: llvm-mc < %s -filetype obj -triple x86_64 -o - \
# RUN: | llvm-dwarfdump --name=a --name=b - | FileCheck %s
# Assembly generated from the following source:
# void foo() {
# struct A {} a;
# {
# int x = 0; // to force the backend to emit this scope
# struct B {} b;
# }
# }
# CHECK-LABEL: DW_TAG_variable
# CHECK: DW_AT_type {{.*}}"A"
# CHECK-LABEL: DW_TAG_variable
# CHECK: DW_AT_type {{.*}}"B"
.text
.file "test.cpp"
.globl _Z3foov # -- Begin function _Z3foov
.p2align 4, 0x90
.type _Z3foov,@function
_Z3foov: # @_Z3foov
.Lfunc_begin0:
.file 1 "/" "test.cpp"
.loc 1 1 0 # test.cpp:1:0
.cfi_startproc
# %bb.0: # %entry
pushq %rbp
.cfi_def_cfa_offset 16
.cfi_offset %rbp, -16
movq %rsp, %rbp
.cfi_def_cfa_register %rbp
.Ltmp0:
.loc 1 4 9 prologue_end # test.cpp:4:9
movl $0, -12(%rbp)
.Ltmp1:
.loc 1 7 1 # test.cpp:7:1
popq %rbp
.cfi_def_cfa %rsp, 8
retq
.Ltmp2:
.Lfunc_end0:
.size _Z3foov, .Lfunc_end0-_Z3foov
.cfi_endproc
# -- End function
.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 18 # DW_AT_high_pc
.byte 6 # DW_FORM_data4
.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
.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 63 # DW_AT_external
.byte 25 # DW_FORM_flag_present
.byte 0 # EOM(1)
.byte 0 # EOM(2)
.byte 3 # Abbreviation Code
.byte 52 # DW_TAG_variable
.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 4 # Abbreviation Code
.byte 11 # DW_TAG_lexical_block
.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 0 # EOM(1)
.byte 0 # EOM(2)
.byte 5 # Abbreviation Code
.byte 19 # DW_TAG_structure_type
.byte 0 # DW_CHILDREN_no
.byte 54 # DW_AT_calling_convention
.byte 11 # DW_FORM_data1
.byte 3 # DW_AT_name
.byte 14 # DW_FORM_strp
.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 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 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:0x8b 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 .Lfunc_begin0 # DW_AT_low_pc
.long .Lfunc_end0-.Lfunc_begin0 # DW_AT_high_pc
.byte 2 # Abbrev [2] 0x2a:0x64 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 86
.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
# DW_AT_external
.byte 3 # Abbrev [3] 0x43:0xe DW_TAG_variable
.byte 2 # DW_AT_location
.byte 145
.byte 120
.long .Linfo_string5 # DW_AT_name
.byte 1 # DW_AT_decl_file
.byte 2 # DW_AT_decl_line
.long 132 # DW_AT_type
.byte 4 # Abbrev [4] 0x51:0x33 DW_TAG_lexical_block
.quad .Ltmp0 # DW_AT_low_pc
.long .Ltmp1-.Ltmp0 # DW_AT_high_pc
.byte 3 # Abbrev [3] 0x5e:0xe DW_TAG_variable
.byte 2 # DW_AT_location
.byte 145
.byte 116
.long .Linfo_string7 # DW_AT_name
.byte 1 # DW_AT_decl_file
.byte 4 # DW_AT_decl_line
.long 142 # DW_AT_type
.byte 3 # Abbrev [3] 0x6c:0xe DW_TAG_variable
.byte 2 # DW_AT_location
.byte 145
.byte 112
.long .Linfo_string9 # DW_AT_name
.byte 1 # DW_AT_decl_file
.byte 5 # DW_AT_decl_line
.long 122 # DW_AT_type
.byte 5 # Abbrev [5] 0x7a:0x9 DW_TAG_structure_type
.byte 5 # DW_AT_calling_convention
.long .Linfo_string10 # DW_AT_name
.byte 1 # DW_AT_byte_size
.byte 1 # DW_AT_decl_file
.byte 5 # DW_AT_decl_line
.byte 0 # End Of Children Mark
.byte 5 # Abbrev [5] 0x84:0x9 DW_TAG_structure_type
.byte 5 # DW_AT_calling_convention
.long .Linfo_string6 # DW_AT_name
.byte 1 # DW_AT_byte_size
.byte 1 # DW_AT_decl_file
.byte 2 # DW_AT_decl_line
.byte 0 # End Of Children Mark
.byte 6 # Abbrev [6] 0x8e:0x7 DW_TAG_base_type
.long .Linfo_string8 # DW_AT_name
.byte 5 # DW_AT_encoding
.byte 4 # DW_AT_byte_size
.byte 0 # End Of Children Mark
.Ldebug_info_end0:
.section .debug_str,"MS",@progbits,1
.Linfo_string0:
.asciz "clang version 14.0.0 (git@github.com:llvm/llvm-project.git)" # string offset=0
.Linfo_string1:
.asciz "test.cpp" # string offset=101
.Linfo_string2:
.asciz "/" # string offset=116
.Linfo_string3:
.asciz "_Z3foov" # string offset=167
.Linfo_string4:
.asciz "foo" # string offset=175
.Linfo_string5:
.asciz "a" # string offset=179
.Linfo_string6:
.asciz "A" # string offset=181
.Linfo_string7:
.asciz "x" # string offset=183
.Linfo_string8:
.asciz "int" # string offset=185
.Linfo_string9:
.asciz "b" # string offset=189
.Linfo_string10:
.asciz "B" # string offset=191
.ident "clang version 14.0.0 (git@github.com:llvm/llvm-project.git)"
.section ".note.GNU-stack","",@progbits
.addrsig
.section .debug_line,"",@progbits
.Lline_table_start0: