intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-13 19:08:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DwarfDebug] Avoid generating extra DW_TAG_subprogram entries (#154636)

Browse Source 
The test llvm/test/DebugInfo/X86/pr12831.ll was added in 4d358b55fa to
fix the issue with emission of empty DW_TAG_subprogram tags
(https://bugs.llvm.org/show_bug.cgi?id=12831).

However, the test output is not checked properly, and it contains:
```
0x00000206:   DW_TAG_subprogram

0x00000207:   DW_TAG_reference_type
                DW_AT_type      (0x00000169 "class ")
```

The reason is that the DIE for the definition DISubprogram "writeExpr"
is created during the call to `getOrCreateSubprogramDIE(declaration of
writeExpr)`. Therefore, when `getOrCreateSubprogramDIE(definition of
writeExpr)` is first called, we get a recursive chain of calls:
```
getOrCreateSubprogramDIE(definition of writeExpr)
getOrCreateSubprogramDIE(declaration of writeExpr)
...
getOrCreateSubprogramDIE(definition of writeExpr)
```

The outer call doesn't expect that the DIE for the definition of
writeExpr will be created during the creation of declaration DIE. So,
another DIE is created for the same subprogram. In this PR, a check is
added to fix that.
This commit is contained in:
Vladislav Dzhidzhoev
2025-08-29 15:32:00 +02:00
committed by GitHub
parent 75b812e130
commit 8c1e62b628
2 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
View File

@@ -1351,6 +1351,13 @@ DIE *DwarfUnit::getOrCreateSubprogramDIE(const DISubprogram *SP, bool Minimal) {
ContextDIE = &getUnitDie();
// Build the decl now to ensure it precedes the definition.
getOrCreateSubprogramDIE(SPDecl);
// Check whether the DIE for SP has already been created after the call
// above.
// FIXME: Should the creation of definition subprogram DIE during
// the creation of declaration subprogram DIE be allowed?
// See https://github.com/llvm/llvm-project/pull/154636.
if (DIE *SPDie = getDIE(SP))
return SPDie;
}
}

37
llvm/test/DebugInfo/X86/pr12831.ll
View File

@@ -1,4 +1,39 @@
; RUN: llc %s -mtriple=x86_64-unknown-linux-gnu -o /dev/null
; RUN: llc %s -mtriple=x86_64-unknown-linux-gnu -filetype=obj -o - | llvm-dwarfdump - | FileCheck %s
; Check that there are no empty DW_TAG_subprogram tags.
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK: DW_TAG_subprogram
; CHECK-NEXT: DW_AT
; CHECK-NOT: DW_TAG_subprogram
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"