Skip to content

[KeyInstr] Inline atom info #133481

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 2 commits into from
May 6, 2025
Merged

[KeyInstr] Inline atom info #133481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
834baf1
[KeyInstr] Inline atom info
OCHyams Mar 21, 2025
06aae56
nit
OCHyams May 1, 2025
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
1 change: 1 addition & 0 deletions llvm/lib/IR/DebugLoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ DebugLoc DebugLoc::appendInlinedAt(const DebugLoc &DL, DILocation *InlinedAt,
// Starting from the top, rebuild the nodes to point to the new inlined-at
// location (then rebuilding the rest of the chain behind it) and update the
// map of already-constructed inlined-at nodes.
// Key Instructions: InlinedAt fields don't need atom info.
for (const DILocation *MD : reverse(InlinedAtLocations))
Cache[MD] = Last = DILocation::getDistinct(
Ctx, MD->getLine(), MD->getColumn(), MD->getScope(), Last);
Expand Down
3 changes: 2 additions & 1 deletion llvm/lib/Transforms/Utils/InlineFunction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1819,7 +1819,8 @@ static DebugLoc inlineDebugLoc(DebugLoc OrigDL, DILocation *InlinedAt,
DenseMap<const MDNode *, MDNode *> &IANodes) {
auto IA = DebugLoc::appendInlinedAt(OrigDL, InlinedAt, Ctx, IANodes);
return DILocation::get(Ctx, OrigDL.getLine(), OrigDL.getCol(),
OrigDL.getScope(), IA);
OrigDL.getScope(), IA, OrigDL.isImplicitCode(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to my comment on a different review, propagating OrigDL's IsImplicitCode field is a change in behaviour.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(note to others: this was discussed offline as fine to ignore)

OrigDL->getAtomGroup(), OrigDL->getAtomRank());
}

/// Update inlined instructions' line numbers to
Expand Down
51 changes: 51 additions & 0 deletions llvm/test/DebugInfo/KeyInstructions/Generic/inline.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
; RUN: opt %s -passes=inline -S -o - | FileCheck %s

;; Inline `f` into `g`. The inlined assignment store and add should retain
;; their atom info.

; CHECK: _Z1gi
; CHECK-NOT: _Z1fi
; CHECK: %add.i = add nsw i32 %mul.i, 1, !dbg [[G1R2:!.*]]
; CHECK-NEXT: store i32 %add.i, ptr %x.i, align 4, !dbg [[G1R1:!.*]]

; CHECK: [[G1R2]] = !DILocation({{.*}}, atomGroup: 1, atomRank: 2)
; CHECK: [[G1R1]] = !DILocation({{.*}}, atomGroup: 1, atomRank: 1)

define hidden void @_Z1fi(i32 noundef %a) !dbg !11 {
entry:
%a.addr = alloca i32, align 4
%x = alloca i32, align 4
store i32 %a, ptr %a.addr, align 4
%0 = load i32, ptr %a.addr, align 4
%mul = mul nsw i32 %0, 2
%add = add nsw i32 %mul, 1, !dbg !19
store i32 %add, ptr %x, align 4, !dbg !20
ret void
}

define hidden void @_Z1gi(i32 noundef %b) !dbg !23 {
entry:
%b.addr = alloca i32, align 4
store i32 %b, ptr %b.addr, align 4
%0 = load i32, ptr %b.addr, align 4
call void @_Z1fi(i32 noundef %0), !dbg !24
ret void
}

!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"}
!11 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 1, type: !12, scopeLine: 1, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0)
!12 = !DISubroutineType(types: !13)
!13 = !{}
!19 = !DILocation(line: 2, scope: !11, atomGroup: 1, atomRank: 2)
!20 = !DILocation(line: 2, scope: !11, atomGroup: 1, atomRank: 1)
!23 = distinct !DISubprogram(name: "g", scope: !1, file: !1, line: 4, type: !12, scopeLine: 4, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0)
!24 = !DILocation(line: 5, scope: !23)