Skip to content

[DebugInfo] Implement TAG_label entries for debug_names #71724

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
Nov 13, 2023
Merged

[DebugInfo] Implement TAG_label entries for debug_names #71724

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
15 changes: 12 additions & 3 deletions llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,9 +1422,18 @@ void DwarfCompileUnit::finishEntityDefinition(const DbgEntity *Entity) {
llvm_unreachable("DbgEntity must be DbgVariable or DbgLabel.");
}

if (Label)
if (const auto *Sym = Label->getSymbol())
addLabelAddress(*Die, dwarf::DW_AT_low_pc, Sym);
if (!Label)
return;

const auto *Sym = Label->getSymbol();
if (!Sym)
return;

addLabelAddress(*Die, dwarf::DW_AT_low_pc, Sym);

// A TAG_label with a name and an AT_low_pc must be placed in debug_names.
if (StringRef Name = Label->getName(); !Name.empty())
getDwarfDebug().addAccelName(*CUNode, Name, *Die);
}

DbgEntity *DwarfCompileUnit::getExistingAbstractEntity(const DINode *Node) {
Expand Down
57 changes: 55 additions & 2 deletions llvm/test/DebugInfo/X86/debug-names-dwarf64.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
; CHECK-NEXT: DW_AT_name ("foo")
; CHECK: [[TYPEDIE:.+]]: DW_TAG_base_type
; CHECK-NEXT: DW_AT_name ("int")
; CHECK: [[SPDIE:.+]]: DW_TAG_subprogram
; CHECK: DW_AT_name ("func")
; CHECK: [[LABELDIE:.+]]: DW_TAG_label
; CHECK-NEXT: DW_AT_name ("MyLabel")

; CHECK: .debug_names contents:
; CHECK-NEXT: Name Index @ 0x0 {
Expand All @@ -19,8 +23,8 @@
; CHECK-NEXT: CU count: 1
; CHECK-NEXT: Local TU count: 0
; CHECK-NEXT: Foreign TU count: 0
; CHECK-NEXT: Bucket count: 2
; CHECK-NEXT: Name count: 2
; CHECK-NEXT: Bucket count: 4
; CHECK-NEXT: Name count: 4
; CHECK: }
; CHECK-NEXT: Compilation Unit offsets [
; CHECK-NEXT: CU[0]: 0x00000000
Expand All @@ -30,6 +34,14 @@
; CHECK-NEXT: Tag: DW_TAG_variable
; CHECK-NEXT: DW_IDX_die_offset: DW_FORM_ref4
; CHECK-NEXT: }
; CHECK-NEXT: Abbreviation [[ABBREV_SP:0x[0-9a-f]*]] {
; CHECK-NEXT: Tag: DW_TAG_subprogram
; CHECK-NEXT: DW_IDX_die_offset: DW_FORM_ref4
; CHECK-NEXT: }
; CHECK-NEXT: Abbreviation [[ABBREV_LABEL:0x[0-9a-f]*]] {
; CHECK-NEXT: Tag: DW_TAG_label
; CHECK-NEXT: DW_IDX_die_offset: DW_FORM_ref4
; CHECK-NEXT: }
; CHECK-NEXT: Abbreviation [[ABBREV:0x[0-9a-f]*]] {
; CHECK-NEXT: Tag: DW_TAG_base_type
; CHECK-NEXT: DW_IDX_die_offset: DW_FORM_ref4
Expand All @@ -56,6 +68,29 @@
; CHECK-NEXT: DW_IDX_die_offset: [[VARDIE]]
; CHECK-NEXT: }
; CHECK-NEXT: }
; CHECK-NEXT: Name 3 {
; CHECK-NEXT: Hash: 0x7C96FE71
; CHECK-NEXT: String: {{.+}} "func"
; CHECK-NEXT: Entry @ {{.+}} {
; CHECK-NEXT: Abbrev: [[ABBREV_SP]]
; CHECK-NEXT: Tag: DW_TAG_subprogram
; CHECK-NEXT: DW_IDX_die_offset: [[SPDIE]]
; CHECK-NEXT: }
; CHECK-NEXT: }
; CHECK-NEXT: ]
; CHECK-NEXT: Bucket 2 [
; CHECK-NEXT: EMPTY
; CHECK-NEXT: ]
; CHECK-NEXT: Bucket 3 [
; CHECK-NEXT: Name 4 {
; CHECK-NEXT: Hash: 0xEC64E52B
; CHECK-NEXT: String: {{.+}} "MyLabel"
; CHECK-NEXT: Entry @ {{.+}} {
; CHECK-NEXT: Abbrev: [[ABBREV_LABEL]]
; CHECK-NEXT: Tag: DW_TAG_label
; CHECK-NEXT: DW_IDX_die_offset: [[LABELDIE]]
; CHECK-NEXT: }
; CHECK-NEXT: }
; CHECK-NEXT: ]
; CHECK-NEXT: }

Expand All @@ -64,12 +99,25 @@
; IR generated and reduced from:
; $ cat foo.c
; int foo;
; void func() {
; goto MyLabel;
;
; MyLabel:
; return 1;
; }
; $ clang -g -gpubnames -S -emit-llvm foo.c -o foo.ll

target triple = "x86_64-unknown-linux-gnu"

@foo = dso_local global i32 0, align 4, !dbg !0

define void @func() !dbg !11 {
call void @llvm.dbg.label(metadata !15), !dbg !14
ret void, !dbg !14
}

declare void @llvm.dbg.label(metadata)

!llvm.dbg.cu = !{!2}
!llvm.module.flags = !{!7, !8, !9}
!llvm.ident = !{!10}
Expand All @@ -85,3 +133,8 @@ target triple = "x86_64-unknown-linux-gnu"
!8 = !{i32 2, !"Debug Info Version", i32 3}
!9 = !{i32 1, !"wchar_size", i32 4}
!10 = !{!"clang version 12.0.0"}
!11 = distinct !DISubprogram(name: "func", linkageName: "func", scope: !3, file: !3, line: 2, type: !12, unit: !2)
!12 = !DISubroutineType(types: !13)
!13 = !{null}
!14 = !DILocation(line: 2, column: 13, scope: !11)
!15 = !DILabel(scope: !11, name: "MyLabel", file: !3, line: 5)