https://github.com/OCHyams created
https://github.com/llvm/llvm-project/pull/133485
None
>From 637b5b4ae3c32e436aa4f03b980ba3332ebc3590 Mon Sep 17 00:00:00 2001
From: Orlando Cazalet-Hyams <orlando.hy...@sony.com>
Date: Mon, 24 Mar 2025 17:23:59 +0000
Subject: [PATCH] [KeyInstr][Inline] Don't propagate atoms to inlined nodebug
instructions
---
llvm/include/llvm/IR/DebugInfoMetadata.h | 7 +++
llvm/lib/Transforms/Utils/InlineFunction.cpp | 4 +-
.../KeyInstructions/Generic/inline-nodbg.ll | 43 +++++++++++++++++++
3 files changed, 52 insertions(+), 2 deletions(-)
create mode 100644 llvm/test/DebugInfo/KeyInstructions/Generic/inline-nodbg.ll
diff --git a/llvm/include/llvm/IR/DebugInfoMetadata.h
b/llvm/include/llvm/IR/DebugInfoMetadata.h
index ede3bda5c68f4..243ea5e1236ad 100644
--- a/llvm/include/llvm/IR/DebugInfoMetadata.h
+++ b/llvm/include/llvm/IR/DebugInfoMetadata.h
@@ -2145,6 +2145,13 @@ class DILocation : public MDNode {
return 0;
}
+ const DILocation *getOrCloneWithoutAtom() const {
+ if (!getAtomGroup() && !getAtomRank())
+ return this;
+ return get(getContext(), getLine(), getColumn(), getScope(),
getInlinedAt(),
+ isImplicitCode());
+ }
+
// Disallow replacing operands.
void replaceOperandWith(unsigned I, Metadata *New) = delete;
diff --git a/llvm/lib/Transforms/Utils/InlineFunction.cpp
b/llvm/lib/Transforms/Utils/InlineFunction.cpp
index 9202451f5726d..fa4f21480b94d 100644
--- a/llvm/lib/Transforms/Utils/InlineFunction.cpp
+++ b/llvm/lib/Transforms/Utils/InlineFunction.cpp
@@ -1821,9 +1821,9 @@ static DebugLoc inlineDebugLoc(DebugLoc OrigDL,
DILocation *InlinedAt,
/// to encode location where these instructions are inlined.
static void fixupLineNumbers(Function *Fn, Function::iterator FI,
Instruction *TheCall, bool CalleeHasDebugInfo) {
- const DebugLoc &TheCallDL = TheCall->getDebugLoc();
- if (!TheCallDL)
+ if (!TheCall->getDebugLoc())
return;
+ DebugLoc TheCallDL = TheCall->getDebugLoc().get()->getOrCloneWithoutAtom();
auto &Ctx = Fn->getContext();
DILocation *InlinedAtNode = TheCallDL;
diff --git a/llvm/test/DebugInfo/KeyInstructions/Generic/inline-nodbg.ll
b/llvm/test/DebugInfo/KeyInstructions/Generic/inline-nodbg.ll
new file mode 100644
index 0000000000000..33f7f673d91c3
--- /dev/null
+++ b/llvm/test/DebugInfo/KeyInstructions/Generic/inline-nodbg.ll
@@ -0,0 +1,43 @@
+; RUN: opt %s -passes=inline -S -o - | FileCheck %s
+
+;; $ cat test.cpp
+;; int g;
+;; [[clang::always_inline, gnu::nodebug]] void a() { g = 1; }
+;; void b() { a(); }
+;;
+;; Check the inlined instructions don't inherit the call's atom info.
+;; FIXME: Perhaps we want to do actually do that, to preserve existing
+;; behaviour? Unclear what's best.
+
+; CHECK: _Z1bv()
+; CHECK: store i32 1, ptr @g, align 4, !dbg [[DBG:!.*]]
+; CHECK: [[DBG]] = !DILocation(line: 3, scope: ![[#]])
+
+@g = hidden global i32 0, align 4
+
+define hidden void @_Z1av() {
+entry:
+ store i32 1, ptr @g, align 4
+ ret void
+}
+
+define hidden void @_Z1bv() !dbg !15 {
+entry:
+ call void @_Z1av(), !dbg !18
+ ret void, !dbg !19
+}
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3}
+!llvm.ident = !{!10}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_17, file: !1,
producer: "clang version 19.0.0", isOptimized: true, runtimeVersion: 0,
emissionKind: LineTablesOnly, 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}
+!10 = !{!"clang version 19.0.0"}
+!15 = distinct !DISubprogram(name: "b", scope: !1, file: !1, line: 3, type:
!16, scopeLine: 3, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags:
DISPFlagDefinition | DISPFlagOptimized, unit: !0)
+!16 = !DISubroutineType(types: !17)
+!17 = !{}
+!18 = !DILocation(line: 3, scope: !15, atomGroup: 1, atomRank: 1)
+!19 = !DILocation(line: 3, scope: !15, atomGroup: 2, atomRank: 1)
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
