Skip to content

[mir-strip-debug] Fix debug location info strip for bundled instructions #113676

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
Oct 29, 2024
Merged

[mir-strip-debug] Fix debug location info strip for bundled instructions #113676

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
2 changes: 1 addition & 1 deletion llvm/lib/CodeGen/MachineStripDebug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ struct StripDebugMachineModule : public ModulePass {
continue;
MachineFunction &MF = *MaybeMF;
for (MachineBasicBlock &MBB : MF) {
for (MachineInstr &MI : llvm::make_early_inc_range(MBB)) {
for (MachineInstr &MI : llvm::make_early_inc_range(MBB.instrs())) {
if (MI.isDebugInstr()) {
// FIXME: We should remove all of them. However, AArch64 emits an
// invalid `DBG_VALUE $lr` with only one operand instead of
Expand Down
63 changes: 63 additions & 0 deletions llvm/test/CodeGen/Generic/MIRStripDebug/bundles.mir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# RUN: llc -run-pass=mir-strip-debug -o - %s | FileCheck %s
# RUN: llc -run-pass=mir-strip-debug,mir-debugify,mir-strip-debug -o - %s | FileCheck %s

--- |
source_filename = "loc-only.ll"

define i32 @test(i32 %a, i32 %b) !dbg !6 {
%add = add i32 %a, 2, !dbg !12
call void @llvm.dbg.value(metadata i32 %add, metadata !9, metadata !DIExpression()), !dbg !12
%sub = sub i32 %add, %b, !dbg !13
call void @llvm.dbg.value(metadata i32 %sub, metadata !11, metadata !DIExpression()), !dbg !13
ret i32 %sub, !dbg !14
}

declare void @llvm.dbg.value(metadata, metadata, metadata)

!llvm.dbg.cu = !{!0}
; CHECK-NOT: !llvm.dbg.cu
!llvm.debugify = !{!3, !4}
; CHECK-NOT: !llvm.debugify
!llvm.module.flags = !{!5}
; CHECK-NOT: !llvm.module.flags

; CHECK-NOT: !DI
!0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
!1 = !DIFile(filename: "<stdin>", directory: "/")
!2 = !{}
!3 = !{i32 3}
!4 = !{i32 2}
!5 = !{i32 2, !"Debug Info Version", i32 3}
!6 = distinct !DISubprogram(name: "test", linkageName: "test", scope: null, file: !1, line: 1, type: !7, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !8)
!7 = !DISubroutineType(types: !2)
!8 = !{!9, !11}
!9 = !DILocalVariable(name: "1", scope: !6, file: !1, line: 1, type: !10)
!10 = !DIBasicType(name: "ty32", size: 32, encoding: DW_ATE_unsigned)
!11 = !DILocalVariable(name: "2", scope: !6, file: !1, line: 2, type: !10)
!12 = !DILocation(line: 1, column: 1, scope: !6)
!13 = !DILocation(line: 2, column: 1, scope: !6)
!14 = !DILocation(line: 3, column: 1, scope: !6)

...
---
name: test
body: |
bb.1 (%ir-block.0):
%0:_(s32) = G_IMPLICIT_DEF
%1:_(s32) = G_IMPLICIT_DEF
BUNDLE {
%2:_(s32) = G_CONSTANT i32 2, debug-location !DILocation(line: 0, scope: !6)
%3:_(s32) = G_ADD %0, %1, debug-location !12
}

; CHECK-LABEL: body:
; CHECK-NOT: debug-location
; CHECK-NOT: !DI
; CHECK-NEXT: bb
; CHECK-NEXT: %0:_(s32) = G_IMPLICIT_DEF{{$}}
; CHECK-NEXT: %1:_(s32) = G_IMPLICIT_DEF{{$}}
; CHECK-NEXT: BUNDLE {
; CHECK-NEXT: %2:_(s32) = G_CONSTANT i32 2{{$}}
; CHECK-NEXT: %3:_(s32) = G_ADD %0, %1{{$}}
; CHECK-NEXT: }
...
Loading