[llvm] [Debuginfo][GVNHoist] Fix #86227: update the debug location of the hoisted GEP (PR #86236)
Shan Huang via llvm-commits
llvm-commits at lists.llvm.org
Fri Mar 22 06:42:01 PDT 2024
https://github.com/Apochens updated https://github.com/llvm/llvm-project/pull/86236
>From bb428854b1cdc72312c67b2540217d00dd8793a7 Mon Sep 17 00:00:00 2001
From: Apochens <52285902006 at stu.ecnu.edu.cn>
Date: Fri, 22 Mar 2024 03:11:58 +0000
Subject: [PATCH 1/2] [Debuginfo][GVNHoist] Fix #86227: update the debug
location of the hoisted GEP
---
llvm/lib/Transforms/Scalar/GVNHoist.cpp | 8 +++
.../Transforms/GVNHoist/hoist-merge-geps.ll | 66 +++++++++++++++++++
2 files changed, 74 insertions(+)
create mode 100644 llvm/test/Transforms/GVNHoist/hoist-merge-geps.ll
diff --git a/llvm/lib/Transforms/Scalar/GVNHoist.cpp b/llvm/lib/Transforms/Scalar/GVNHoist.cpp
index b564f00eb9d166..b95421d2035b58 100644
--- a/llvm/lib/Transforms/Scalar/GVNHoist.cpp
+++ b/llvm/lib/Transforms/Scalar/GVNHoist.cpp
@@ -951,6 +951,14 @@ void GVNHoist::makeGepsAvailable(Instruction *Repl, BasicBlock *HoistPt,
OtherGep = cast<GetElementPtrInst>(
cast<StoreInst>(OtherInst)->getPointerOperand());
ClonedGep->andIRFlags(OtherGep);
+
+ // Merge debug locations of GEPs, because the hoisted GEP replaces those
+ // in branches. When cloning, ClonedGep preserves the debug location of
+ // Gepd, so Gep is skipped to avoid merging it twice.
+ if (OtherGep != Gep) {
+ ClonedGep->applyMergedLocation(
+ ClonedGep->getDebugLoc(), OtherGep->getDebugLoc());
+ }
}
// Replace uses of Gep with ClonedGep in Repl.
diff --git a/llvm/test/Transforms/GVNHoist/hoist-merge-geps.ll b/llvm/test/Transforms/GVNHoist/hoist-merge-geps.ll
new file mode 100644
index 00000000000000..045b3c2c78280d
--- /dev/null
+++ b/llvm/test/Transforms/GVNHoist/hoist-merge-geps.ll
@@ -0,0 +1,66 @@
+; RUN: opt -S -passes=gvn-hoist < %s | FileCheck %s
+
+; Function Attrs: noinline nounwind uwtable
+define dso_local void @func(i32 noundef %a, ptr noundef %b) #0 !dbg !10 {
+; Check the merged debug location of hoisted GEP
+; CHECK: entry
+; CHECK: %{{[a-zA-Z0-9_]*}} = getelementptr {{.*}} !dbg [[MERGED_DL:![0-9]+]]
+; CHECK: [[MERGED_DL]] = !DILocation(line: 0, scope: !{{[0-9]+}})
+entry:
+ tail call void @llvm.dbg.value(metadata i32 %a, metadata !16, metadata !DIExpression()), !dbg !17
+ tail call void @llvm.dbg.value(metadata ptr %b, metadata !18, metadata !DIExpression()), !dbg !17
+ %tobool = icmp ne i32 %a, 0, !dbg !19
+ br i1 %tobool, label %if.then, label %if.else, !dbg !21
+
+if.then: ; preds = %entry
+ %arrayidx = getelementptr inbounds i32, ptr %b, i64 1, !dbg !22
+ store i32 1, ptr %arrayidx, align 4, !dbg !24
+ br label %if.end, !dbg !25
+
+if.else: ; preds = %entry
+ %arrayidx1 = getelementptr inbounds i32, ptr %b, i64 1, !dbg !26
+ store i32 1, ptr %arrayidx1, align 4, !dbg !28
+ br label %if.end
+
+if.end: ; preds = %if.else, %if.then
+ ret void, !dbg !29
+}
+
+; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
+declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C11, file: !1, producer: "clang version 19.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "main.c", directory: "/root/llvm-test/GVNHoist")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 8, !"PIC Level", i32 2}
+!6 = !{i32 7, !"PIE Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 2}
+!8 = !{i32 7, !"frame-pointer", i32 2}
+!10 = distinct !DISubprogram(name: "func", scope: !1, file: !1, line: 1, type: !11, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !15)
+!11 = !DISubroutineType(types: !12)
+!12 = !{null, !13, !14}
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !13, size: 64)
+!15 = !{}
+!16 = !DILocalVariable(name: "a", arg: 1, scope: !10, file: !1, line: 1, type: !13)
+!17 = !DILocation(line: 0, scope: !10)
+!18 = !DILocalVariable(name: "b", arg: 2, scope: !10, file: !1, line: 1, type: !14)
+!19 = !DILocation(line: 2, column: 9, scope: !20)
+!20 = distinct !DILexicalBlock(scope: !10, file: !1, line: 2, column: 9)
+!21 = !DILocation(line: 2, column: 9, scope: !10)
+!22 = !DILocation(line: 3, column: 9, scope: !23)
+!23 = distinct !DILexicalBlock(scope: !20, file: !1, line: 2, column: 12)
+!24 = !DILocation(line: 3, column: 14, scope: !23)
+!25 = !DILocation(line: 4, column: 5, scope: !23)
+!26 = !DILocation(line: 5, column: 9, scope: !27)
+!27 = distinct !DILexicalBlock(scope: !20, file: !1, line: 4, column: 12)
+!28 = !DILocation(line: 5, column: 14, scope: !27)
+!29 = !DILocation(line: 7, column: 1, scope: !10)
>From 43afcf24097fa705d576f07d0cd1454acf534fc2 Mon Sep 17 00:00:00 2001
From: Apochens <52285902006 at stu.ecnu.edu.cn>
Date: Fri, 22 Mar 2024 13:41:47 +0000
Subject: [PATCH 2/2] minor nits
---
llvm/lib/Transforms/Scalar/GVNHoist.cpp | 8 ++++----
llvm/test/Transforms/GVNHoist/hoist-merge-geps.ll | 7 +++----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/llvm/lib/Transforms/Scalar/GVNHoist.cpp b/llvm/lib/Transforms/Scalar/GVNHoist.cpp
index b95421d2035b58..261c1259c9c961 100644
--- a/llvm/lib/Transforms/Scalar/GVNHoist.cpp
+++ b/llvm/lib/Transforms/Scalar/GVNHoist.cpp
@@ -951,13 +951,13 @@ void GVNHoist::makeGepsAvailable(Instruction *Repl, BasicBlock *HoistPt,
OtherGep = cast<GetElementPtrInst>(
cast<StoreInst>(OtherInst)->getPointerOperand());
ClonedGep->andIRFlags(OtherGep);
-
+
// Merge debug locations of GEPs, because the hoisted GEP replaces those
- // in branches. When cloning, ClonedGep preserves the debug location of
+ // in branches. When cloning, ClonedGep preserves the debug location of
// Gepd, so Gep is skipped to avoid merging it twice.
if (OtherGep != Gep) {
- ClonedGep->applyMergedLocation(
- ClonedGep->getDebugLoc(), OtherGep->getDebugLoc());
+ ClonedGep->applyMergedLocation(ClonedGep->getDebugLoc(),
+ OtherGep->getDebugLoc());
}
}
diff --git a/llvm/test/Transforms/GVNHoist/hoist-merge-geps.ll b/llvm/test/Transforms/GVNHoist/hoist-merge-geps.ll
index 045b3c2c78280d..887c85596aed87 100644
--- a/llvm/test/Transforms/GVNHoist/hoist-merge-geps.ll
+++ b/llvm/test/Transforms/GVNHoist/hoist-merge-geps.ll
@@ -1,7 +1,6 @@
; RUN: opt -S -passes=gvn-hoist < %s | FileCheck %s
-; Function Attrs: noinline nounwind uwtable
-define dso_local void @func(i32 noundef %a, ptr noundef %b) #0 !dbg !10 {
+define dso_local void @func(i32 noundef %a, ptr noundef %b) !dbg !10 {
; Check the merged debug location of hoisted GEP
; CHECK: entry
; CHECK: %{{[a-zA-Z0-9_]*}} = getelementptr {{.*}} !dbg [[MERGED_DL:![0-9]+]]
@@ -27,10 +26,10 @@ if.end: ; preds = %if.else, %if.then
}
; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+declare void @llvm.dbg.declare(metadata, metadata, metadata)
; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare void @llvm.dbg.value(metadata, metadata, metadata) #1
+declare void @llvm.dbg.value(metadata, metadata, metadata)
!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
More information about the llvm-commits
mailing list