Skip to content

Commit

Permalink
[DebugInfo] Treat empty metadata operands the same as undef operands …
Browse files Browse the repository at this point in the history
…in SelectionDAG

Without this patch SelectionDAG silently drops dbg.values using `!{}` operands.

Related to https://discourse.llvm.org/t/auto-undef-debug-uses-of-a-deleted-value

Reviewed By: StephenTozer

Differential Revision: https://reviews.llvm.org/D140990
  • Loading branch information
OCHyams committed Apr 26, 2023
1 parent f9478f7 commit 2b3c13b
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 4 deletions.
20 changes: 17 additions & 3 deletions llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,17 @@ void SelectionDAGBuilder::salvageUnresolvedDbgValue(DanglingDebugInfo &DDI) {
<< "\n");
}

void SelectionDAGBuilder::handleKillDebugValue(DILocalVariable *Var,
DIExpression *Expr,
DebugLoc DbgLoc,
unsigned Order) {
Value *Poison = PoisonValue::get(Type::getInt1Ty(*Context));
DIExpression *NewExpr =
const_cast<DIExpression *>(DIExpression::convertToUndefExpression(Expr));
handleDebugValue(Poison, Var, NewExpr, DbgLoc, Order,
/*IsVariadic*/ false);
}

bool SelectionDAGBuilder::handleDebugValue(ArrayRef<const Value *> Values,
DILocalVariable *Var,
DIExpression *Expr, DebugLoc DbgLoc,
Expand Down Expand Up @@ -6226,11 +6237,14 @@ void SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I,
DILocalVariable *Variable = DI.getVariable();
DIExpression *Expression = DI.getExpression();
dropDanglingDebugInfo(Variable, Expression);
SmallVector<Value *, 4> Values(DI.getValues());
if (Values.empty())

if (DI.isKillLocation()) {
handleKillDebugValue(Variable, Expression, DI.getDebugLoc(), SDNodeOrder);
return;
}

if (llvm::is_contained(Values, nullptr))
SmallVector<Value *, 4> Values(DI.getValues());
if (Values.empty())
return;

bool IsVariadic = DI.hasArgList();
Expand Down
4 changes: 4 additions & 0 deletions llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,10 @@ class SelectionDAGBuilder {
DIExpression *Expr, DebugLoc DbgLoc, unsigned Order,
bool IsVariadic);

/// Create a record for a kill location debug intrinsic.
void handleKillDebugValue(DILocalVariable *Var, DIExpression *Expr,
DebugLoc DbgLoc, unsigned Order);

/// Evict any dangling debug information, attempting to salvage it first.
void resolveOrClearDbgInfo();

Expand Down
2 changes: 1 addition & 1 deletion llvm/test/CodeGen/AMDGPU/llvm.dbg.value.ll
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ entry:
; SIOptimizeExecMaskingPreRA (somehow related to undef argument).

; GCN-LABEL: {{^}}only_undef_dbg_value:
; NOOPT: ;DEBUG_VALUE: test_debug_value:globalptr_arg <- [DW_OP_constu 1, DW_OP_swap, DW_OP_xderef] undef
; NOOPT: ;DEBUG_VALUE: test_debug_value:globalptr_arg <- undef
; NOOPT-NEXT: s_endpgm

; OPT: s_endpgm
Expand Down
49 changes: 49 additions & 0 deletions llvm/test/DebugInfo/X86/dbg-empty-metadata-lowering.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
; RUN: llc %s -stop-after=finalize-isel -o - | FileCheck %s --implicit-check-not=DBG

;; Check that dbg.values with empty metadata are treated as kills (i.e. become
;; DBG_VALUE $noreg, ...). dbg.declares with empty metadata location operands
;; should be ignored.

; CHECK: stack: []
; CHECK: DBG_VALUE float 5.000000e+00
; CHECK: @ext
; CHECK: DBG_VALUE $noreg
; CHECK: @ext

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

define dso_local void @fun() local_unnamed_addr #0 !dbg !9 {
entry:
call void @llvm.dbg.declare(metadata !{}, metadata !20, metadata !DIExpression()), !dbg !15
call void @llvm.dbg.value(metadata float 5.000000e+00, metadata !13, metadata !DIExpression()), !dbg !15
tail call void @ext(), !dbg !16
call void @llvm.dbg.value(metadata !{}, metadata !13, metadata !DIExpression()), !dbg !15
tail call void @ext(), !dbg !16
ret void, !dbg !17
}

declare !dbg !18 void @ext() local_unnamed_addr
declare void @llvm.dbg.value(metadata, metadata, metadata)
declare void @llvm.dbg.declare(metadata, metadata, metadata)

!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!2, !3}
!llvm.ident = !{!8}

!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 16.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
!1 = !DIFile(filename: "test.cpp", directory: "/")
!2 = !{i32 7, !"Dwarf Version", i32 5}
!3 = !{i32 2, !"Debug Info Version", i32 3}
!8 = !{!"clang version 16.0.0"}
!9 = distinct !DISubprogram(name: "fun", linkageName: "fun", scope: !1, file: !1, line: 2, type: !10, scopeLine: 2, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !12)
!10 = !DISubroutineType(types: !11)
!11 = !{null}
!12 = !{!13}
!13 = !DILocalVariable(name: "f", scope: !9, file: !1, line: 3, type: !14)
!14 = !DIBasicType(name: "float", size: 32, encoding: DW_ATE_float)
!15 = !DILocation(line: 0, scope: !9)
!16 = !DILocation(line: 4, column: 3, scope: !9)
!17 = !DILocation(line: 5, column: 1, scope: !9)
!18 = !DISubprogram(name: "ext", linkageName: "ext", scope: !1, file: !1, line: 1, type: !10, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !19)
!19 = !{}
!20 = !DILocalVariable(name: "g", scope: !9, file: !1, line: 3, type: !14)

0 comments on commit 2b3c13b

Please sign in to comment.