Skip to content

Commit 1586d48

Browse files
Snowy1803Snowy1803
committed
[IRGenDebugInfo] Disable usage of dbg.declare in optimized code
Except for the async context, where it is needed (arguments within an async function). We don't support dbg.declare in optimized code, as variables can be moved by SIL optimization passes. If a partial store is eliminated, we want a dbg.value on the allocation, and another dbg.value with a fragment in place of the partial store. rdar://128155050 (cherry picked from commit 5606fbc)
1 parent 7ab6ce6 commit 1586d48

File tree

5 files changed

+24
-17
lines changed

5 files changed

+24
-17
lines changed

‎lib/IRGen/IRGenDebugInfo.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3438,6 +3438,10 @@ void IRGenDebugInfoImpl::emitDbgIntrinsic(
34383438
return;
34393439
}
34403440

3441+
bool optimized = DS->getParentFunction()->shouldOptimize();
3442+
if (optimized && (!InCoroContext || !Var->isParameter()))
3443+
AddrDInstKind = AddrDbgInstrKind::DbgValueDeref;
3444+
34413445
DbgIntrinsicEmitter inserter{Builder, DBuilder, AddrDInstKind};
34423446

34433447
// If we have a single alloca...
@@ -3464,7 +3468,7 @@ void IRGenDebugInfoImpl::emitDbgIntrinsic(
34643468
return;
34653469
}
34663470

3467-
if (InCoroContext) {
3471+
if (InCoroContext && (Var->isParameter() || !optimized)) {
34683472
PointerUnion<llvm::BasicBlock *, llvm::Instruction *> InsertPt;
34693473

34703474
// If we have a dbg.declare, we are relying on a contract with the coroutine

‎test/AutoDiff/compiler_crashers_fixed/issue-58123-invalid-debug-info.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
// CHECK-LABEL: define internal swiftcc float @"$s4main8TestTypeV24doDifferentiableTimeStep04timeG0ySf_tFTJpSSpSrTA"
88
// CHECK: [[SELF:%.*]] = alloca %T4main8TestTypeV06ManualB7TangentV
9-
// CHECK: call void @llvm.dbg.declare(metadata ptr [[SELF]]
9+
// CHECK: call void @llvm.dbg.value(metadata ptr [[SELF]]
1010

1111
import _Differentiation
1212

‎test/IRGen/debug_fragment_merge.swift renamed to ‎test/DebugInfo/debug_fragment_merge.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ func test(cond: Int, external: External) async {
3131
// CHECK-SIL: debug_value %{{.*}} : $String, let, (name "data", {{.*}}), type $Data, expr op_fragment:#Data.a
3232
// CHECK-SIL: debug_value %{{.*}} : $String, let, (name "data", {{.*}}), type $Data, expr op_fragment:#Data.b
3333

34-
// CHECK-DAG: llvm.dbg.declare{{.*}} metadata ![[VAR:[0-9]+]], metadata !DIExpression(DW_OP_LLVM_fragment, 192, 64){{.*}} !dbg ![[LOC1]]
35-
// CHECK-DAG: llvm.dbg.declare{{.*}} metadata ![[VAR]], metadata !DIExpression(DW_OP_LLVM_fragment, 128, 64){{.*}} !dbg ![[LOC1]]
36-
// CHECK-DAG: llvm.dbg.declare{{.*}} metadata ![[VAR]], metadata !DIExpression(DW_OP_LLVM_fragment, 64, 64){{.*}} !dbg ![[LOC1]]
37-
// CHECK-DAG: llvm.dbg.declare{{.*}} metadata ![[VAR]], metadata !DIExpression(DW_OP_LLVM_fragment, 0, 64){{.*}} !dbg ![[LOC1]]
34+
// CHECK-DAG: llvm.dbg.value{{.*}} metadata ![[VAR:[0-9]+]], metadata !DIExpression(DW_OP_LLVM_fragment, 192, 64){{.*}} !dbg ![[LOC1]]
35+
// CHECK-DAG: llvm.dbg.value{{.*}} metadata ![[VAR]], metadata !DIExpression(DW_OP_LLVM_fragment, 128, 64){{.*}} !dbg ![[LOC1]]
36+
// CHECK-DAG: llvm.dbg.value{{.*}} metadata ![[VAR]], metadata !DIExpression(DW_OP_LLVM_fragment, 64, 64){{.*}} !dbg ![[LOC1]]
37+
// CHECK-DAG: llvm.dbg.value{{.*}} metadata ![[VAR]], metadata !DIExpression(DW_OP_LLVM_fragment, 0, 64){{.*}} !dbg ![[LOC1]]
3838
//
39-
// CHECK-DAG: llvm.dbg.declare{{.*}} metadata ![[VAR]], metadata !DIExpression(DW_OP_LLVM_fragment, 192, 64){{.*}} !dbg ![[LOC2]]
40-
// CHECK-DAG: llvm.dbg.declare{{.*}} metadata ![[VAR]], metadata !DIExpression(DW_OP_LLVM_fragment, 128, 64){{.*}} !dbg ![[LOC2]]
41-
// CHECK-DAG: llvm.dbg.declare{{.*}} metadata ![[VAR]], metadata !DIExpression(DW_OP_LLVM_fragment, 64, 64){{.*}} !dbg ![[LOC2]]
42-
// CHECK-DAG: llvm.dbg.declare{{.*}} metadata ![[VAR]], metadata !DIExpression(DW_OP_LLVM_fragment, 0, 64){{.*}} !dbg ![[LOC2]]
39+
// CHECK-DAG: llvm.dbg.value{{.*}} metadata ![[VAR]], metadata !DIExpression(DW_OP_LLVM_fragment, 192, 64){{.*}} !dbg ![[LOC2]]
40+
// CHECK-DAG: llvm.dbg.value{{.*}} metadata ![[VAR]], metadata !DIExpression(DW_OP_LLVM_fragment, 128, 64){{.*}} !dbg ![[LOC2]]
41+
// CHECK-DAG: llvm.dbg.value{{.*}} metadata ![[VAR]], metadata !DIExpression(DW_OP_LLVM_fragment, 64, 64){{.*}} !dbg ![[LOC2]]
42+
// CHECK-DAG: llvm.dbg.value{{.*}} metadata ![[VAR]], metadata !DIExpression(DW_OP_LLVM_fragment, 0, 64){{.*}} !dbg ![[LOC2]]

‎test/IRGen/debug_scope_distinct.swift renamed to ‎test/DebugInfo/debug_scope_distinct.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
// REQUIRES: CPU=arm64 || CPU=x86_64 || CPU=arm64e
99

10+
// XFAIL: *
11+
// rdar://128505421
12+
1013
// CHECK: define {{.*}} void @"$s4main1TV4move2byyAC13TangentVectorV_tF"
1114
// CHECK-SAME: ptr {{.*}} %[[ARG_PTR:.*]],
1215
//

‎test/DebugInfo/inlined-generics-basic.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ public class C<R> {
5252
// SIL: function_ref {{.*}}use{{.*}} scope [[F1G3H]]
5353
// IR: dbg.value(metadata ptr %[[ARG_S]], metadata ![[MD_1_0:[0-9]+]]
5454
// IR: %[[RS_PAIR:.*]] = alloca i8, i{{.*}} %
55-
// IR: dbg.declare(metadata ptr %[[RS_PAIR]], metadata ![[GRS_U:[0-9]+]],
56-
// IR: dbg.declare(metadata ptr %[[RS_PAIR]], metadata ![[GRS_T:[0-9]+]],
5755
// IR: dbg.value(metadata ptr %[[ARG_0]], metadata ![[S:[0-9]+]]
5856
// IR: dbg.value(metadata ptr %[[ARG_0]], metadata ![[GS_T:[0-9]+]]
5957
// IR: dbg.value(metadata ptr %[[ARG_0]], metadata ![[GS_U:[0-9]+]]
@@ -71,6 +69,8 @@ public class C<R> {
7169
// IR: call {{.*}}3use
7270
#sourceLocation(file: "f.swift", line: 3)
7371
g(r)
72+
// IR: dbg.value(metadata ptr %[[RS_PAIR]], metadata ![[GRS_T:[0-9]+]],
73+
// IR: dbg.value(metadata ptr %[[RS_PAIR]], metadata ![[GRS_U:[0-9]+]],
7474
// IR: call {{.*}}3use
7575
#sourceLocation(file: "f.swift", line: 4)
7676
g((r, s))
@@ -108,17 +108,17 @@ public class C<R> {
108108
// IR-DAG: ![[S]] = !DILocalVariable(name: "s", {{.*}} type: ![[LET_TAU_1_0:[0-9]+]]
109109
// IR-DAG: ![[LET_TAU_1_0]] = !DIDerivedType(tag: DW_TAG_const_type, baseType: ![[TAU_1_0]])
110110
// IR-DAG: ![[GS_T]] = !DILocalVariable(name: "t", {{.*}} scope: ![[SP_GS_T:[0-9]+]], {{.*}} type: ![[LET_TAU_1_0]])
111-
// IR: ![[SP_GS_T]] = {{.*}}linkageName: "$s1A1gyyxlFqd___Ti5"
112-
// IR: ![[GS_U]] = !DILocalVariable(name: "u", {{.*}} scope: ![[SP_GS_U:[0-9]+]], {{.*}} type: ![[LET_TAU_1_0]])
113-
// IR: ![[SP_GS_U]] = {{.*}}linkageName: "$s1A1hyyxlFqd___Ti5"
111+
// IR-DAG: ![[SP_GS_T]] = {{.*}}linkageName: "$s1A1gyyxlFqd___Ti5"
112+
// IR-DAG: ![[GS_U]] = !DILocalVariable(name: "u", {{.*}} scope: ![[SP_GS_U:[0-9]+]], {{.*}} type: ![[LET_TAU_1_0]])
113+
// IR-DAG: ![[SP_GS_U]] = {{.*}}linkageName: "$s1A1hyyxlFqd___Ti5"
114114

115115
// Debug info for this variable is removed. See the note above the call to g(r).
116116
// ![[GR_T]] = !DILocalVariable(name: "t", {{.*}} scope: ![[SP_GR_T:[0-9]+]], {{.*}}type: ![[LET_TAU_0_0]])
117117
// S has the same generic parameter numbering s T and U.
118118
// ![[SP_GR_T]] = {{.*}}linkageName: "$s1A1gyyxlF"
119119

120-
// IR: ![[GR_U]] = !DILocalVariable(name: "u", {{.*}} scope: ![[SP_GR_U:[0-9]+]], {{.*}}type: ![[LET_TAU_0_0]])
121-
// IR: ![[SP_GR_U]] = {{.*}}linkageName: "$s1A1hyyxlF"
120+
// IR-DAG: ![[GR_U]] = !DILocalVariable(name: "u", {{.*}} scope: ![[SP_GR_U:[0-9]+]], {{.*}}type: ![[LET_TAU_0_0]])
121+
// IR-DAG: ![[SP_GR_U]] = {{.*}}linkageName: "$s1A1hyyxlF"
122122
// IR-DAG: ![[GI_T]] = !DILocalVariable(name: "t", {{.*}} scope: ![[SP_GI_G:[0-9]+]], {{.*}}type: ![[LET_INT]])
123123
// IR-DAG: ![[SP_GI_G]] = {{.*}}linkageName: "$s1A1gyyxlFSi_Tg5"
124124
// IR-DAG: ![[GI_U]] = !DILocalVariable(name: "u", {{.*}} scope: ![[SP_GI_U:[0-9]+]], {{.*}}type: ![[LET_INT]])

0 commit comments

Comments
 (0)