Skip to content

Commit 0945727

Browse files
SLTozerSLTozer
authored
[RemoveDIs] Print IR with debug records by default (#91724)
This patch makes the final major change of the RemoveDIs project, changing the default IR output from debug intrinsics to debug records. This is expected to break a large number of tests: every single one that tests for uses or declarations of debug intrinsics and does not explicitly disable writing records. If this patch has broken your downstream tests (or upstream tests on a configuration I wasn't able to run): 1. If you need to immediately unblock a build, pass `--write-experimental-debuginfo=false` to LLVM's option processing for all failing tests (remember to use `-mllvm` for clang/flang to forward arguments to LLVM). 2. For most test failures, the changes are trivial and mechanical, enough that they can be done by script; see the migration guide for a guide on how to do this: https://llvm.org/docs/RemoveDIsDebugInfo.html#test-updates 3. If any tests fail for reasons other than FileCheck check lines that need updating, such as assertion failures, that is most likely a real bug with this patch and should be reported as such. For more information, see the recent PSA: https://discourse.llvm.org/t/psa-ir-output-changing-from-debug-intrinsics-to-debug-records/79578
1 parent 6b4760a commit 0945727

File tree

352 files changed

+5416
-5289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

352 files changed

+5416
-5289
lines changed

‎clang/test/CodeGen/2010-07-08-DeclDebugLineNo.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited %s -o - | FileCheck %s
22
// Insure that dbg.declare lines for locals refer to correct line number records.
33
void foo(void) {
4-
int l = 0; // line #4: CHECK: {{call.*llvm.dbg.declare.*%l.*\!dbg }}[[variable_l:![0-9]+]]
5-
int p = 0; // line #5: CHECK: {{call.*llvm.dbg.declare.*%p.*\!dbg }}[[variable_p:![0-9]+]]
4+
int l = 0; // line #4: CHECK: #dbg_declare({{.*%l.*}} [[variable_l:![0-9]+]]
5+
int p = 0; // line #5: CHECK: #dbg_declare({{.*%p.*}} [[variable_p:![0-9]+]]
66
}
77
// Now match the line number records:
88
// CHECK: {{^}}[[variable_l]] = !DILocation(line: 4,

‎clang/test/CodeGen/assignment-tracking/assignment-tracking.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,34 @@ Large L;
2020
void zeroInit() { int Z[3] = {0, 0, 0}; }
2121
// CHECK-LABEL: define dso_local void @_Z8zeroInitv
2222
// CHECK: %Z = alloca [3 x i32], align 4, !DIAssignID ![[ID_0:[0-9]+]]
23-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_0:[0-9]+]], metadata !DIExpression(), metadata ![[ID_0]], metadata ptr %Z, metadata !DIExpression())
23+
// CHECK-NEXT: #dbg_assign(i1 undef, ![[VAR_0:[0-9]+]], !DIExpression(), ![[ID_0]], ptr %Z, !DIExpression(),
2424
// CHECK: @llvm.memset{{.*}}, !DIAssignID ![[ID_1:[0-9]+]]
25-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata i8 0, metadata ![[VAR_0]], metadata !DIExpression(), metadata ![[ID_1]], metadata ptr %Z, metadata !DIExpression())
25+
// CHECK-NEXT: #dbg_assign(i8 0, ![[VAR_0]], !DIExpression(), ![[ID_1]], ptr %Z, !DIExpression(),
2626

2727
void memcpyInit() { int A[4] = {0, 1, 2, 3}; }
2828
// CHECK-LABEL: define dso_local void @_Z10memcpyInitv
2929
// CHECK: %A = alloca [4 x i32], align 16, !DIAssignID ![[ID_2:[0-9]+]]
30-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_1:[0-9]+]], metadata !DIExpression(), metadata ![[ID_2]], metadata ptr %A, metadata !DIExpression())
30+
// CHECK-NEXT: #dbg_assign(i1 undef, ![[VAR_1:[0-9]+]], !DIExpression(), ![[ID_2]], ptr %A, !DIExpression(),
3131
// CHECK: @llvm.memcpy{{.*}}, !DIAssignID ![[ID_3:[0-9]+]]
32-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_1]], metadata !DIExpression(), metadata ![[ID_3]], metadata ptr %A, metadata !DIExpression())
32+
// CHECK-NEXT: #dbg_assign(i1 undef, ![[VAR_1]], !DIExpression(), ![[ID_3]], ptr %A, !DIExpression(),
3333

3434
void setField() {
3535
Outer O;
3636
O.A.B = Value;
3737
}
3838
// CHECK-LABEL: define dso_local void @_Z8setFieldv
3939
// CHECK: %O = alloca %struct.Outer, align 4, !DIAssignID ![[ID_4:[0-9]+]]
40-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_2:[0-9]+]], metadata !DIExpression(), metadata ![[ID_4]], metadata ptr %O, metadata !DIExpression())
40+
// CHECK-NEXT: #dbg_assign(i1 undef, ![[VAR_2:[0-9]+]], !DIExpression(), ![[ID_4]], ptr %O, !DIExpression(),
4141
// CHECK: store i32 %0, ptr %B, align 4,{{.*}}!DIAssignID ![[ID_5:[0-9]+]]
42-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata i32 %0, metadata ![[VAR_2]], metadata !DIExpression(DW_OP_LLVM_fragment, 32, 32), metadata ![[ID_5]], metadata ptr %B, metadata !DIExpression())
42+
// CHECK-NEXT: #dbg_assign(i32 %0, ![[VAR_2]], !DIExpression(DW_OP_LLVM_fragment, 32, 32), ![[ID_5]], ptr %B, !DIExpression(),
4343

4444
void unknownOffset() {
4545
int A[2];
4646
A[Index] = Value;
4747
}
4848
// CHECK-LABEL: define dso_local void @_Z13unknownOffsetv
4949
// CHECK: %A = alloca [2 x i32], align 4, !DIAssignID ![[ID_6:[0-9]+]]
50-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_3:[0-9]+]], metadata !DIExpression(), metadata ![[ID_6]], metadata ptr %A, metadata !DIExpression())
50+
// CHECK-NEXT: #dbg_assign(i1 undef, ![[VAR_3:[0-9]+]], !DIExpression(), ![[ID_6]], ptr %A, !DIExpression(),
5151

5252
Inner sharedAlloca() {
5353
if (Cond) {
@@ -60,34 +60,34 @@ Inner sharedAlloca() {
6060
}
6161
// CHECK-LABEL: define dso_local i64 @_Z12sharedAllocav
6262
// CHECK: %retval = alloca %struct.Inner, align 4, !DIAssignID ![[ID_7:[0-9]+]]
63-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_4:[0-9]+]], metadata !DIExpression(), metadata ![[ID_7]], metadata ptr %retval, metadata !DIExpression())
64-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_5:[0-9]+]], metadata !DIExpression(), metadata ![[ID_7]], metadata ptr %retval, metadata !DIExpression())
63+
// CHECK-NEXT: #dbg_assign(i1 undef, ![[VAR_4:[0-9]+]], !DIExpression(), ![[ID_7]], ptr %retval, !DIExpression(),
64+
// CHECK-NEXT: #dbg_assign(i1 undef, ![[VAR_5:[0-9]+]], !DIExpression(), ![[ID_7]], ptr %retval, !DIExpression(),
6565
// CHECK: if.then:
6666
// CHECK: call void @llvm.memcpy{{.*}}, !DIAssignID ![[ID_8:[0-9]+]]
67-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_4]], metadata !DIExpression(), metadata ![[ID_8]], metadata ptr %retval, metadata !DIExpression())
68-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_5]], metadata !DIExpression(), metadata ![[ID_8]], metadata ptr %retval, metadata !DIExpression())
67+
// CHECK-NEXT: #dbg_assign(i1 undef, ![[VAR_4]], !DIExpression(), ![[ID_8]], ptr %retval, !DIExpression(),
68+
// CHECK-NEXT: #dbg_assign(i1 undef, ![[VAR_5]], !DIExpression(), ![[ID_8]], ptr %retval, !DIExpression(),
6969
// CHECK: if.else:
7070
// CHECK: call void @llvm.memcpy{{.*}}, !DIAssignID ![[ID_9:[0-9]+]]
71-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_4]], metadata !DIExpression(), metadata ![[ID_9]], metadata ptr %retval, metadata !DIExpression())
72-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata i1 undef, metadata ![[VAR_5]], metadata !DIExpression(), metadata ![[ID_9]], metadata ptr %retval, metadata !DIExpression())
71+
// CHECK-NEXT: #dbg_assign(i1 undef, ![[VAR_4]], !DIExpression(), ![[ID_9]], ptr %retval, !DIExpression(),
72+
// CHECK-NEXT: #dbg_assign(i1 undef, ![[VAR_5]], !DIExpression(), ![[ID_9]], ptr %retval, !DIExpression(),
7373

7474
Large sret() {
7575
Large X = L;
7676
return X;
7777
}
7878
// CHECK-LABEL: define dso_local void @_Z4sretv
79-
// CHECK: llvm.dbg.declare
79+
// CHECK: #dbg_declare
8080

8181
void byval(Large X) {}
8282
// CHECK-LABEL: define dso_local void @_Z5byval5Large
83-
// CHECK: llvm.dbg.declare
83+
// CHECK: #dbg_declare
8484

8585
LCopyCtor indirectReturn() {
8686
LCopyCtor R;
8787
return R;
8888
}
8989
// CHECK-LABEL: define dso_local void @_Z14indirectReturnv
90-
// CHECK: call void @llvm.dbg.declare
90+
// CHECK: #dbg_declare
9191

9292
// CHECK-DAG: ![[VAR_0]] = !DILocalVariable(name: "Z",
9393
// CHECK-DAG: ![[VAR_1]] = !DILocalVariable(name: "A",

‎clang/test/CodeGen/assignment-tracking/memcpy-fragment.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void fragmentWhole()
2323
__builtin_memcpy(&dest.ch, &src, sizeof(char));
2424
}
2525
// CHECK: call void @llvm.memcpy{{.+}}, !DIAssignID ![[memberID:[0-9]+]]
26-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata{{.*}}undef, metadata !{{[0-9]+}}, metadata !DIExpression(DW_OP_LLVM_fragment, 32, 8), metadata ![[memberID]], metadata ptr %ch, metadata !DIExpression())
26+
// CHECK-NEXT: #dbg_assign({{.*}}undef, !{{[0-9]+}}, !DIExpression(DW_OP_LLVM_fragment, 32, 8), ![[memberID]], ptr %ch, !DIExpression(),
2727

2828
// Write starting at a field and overlapping part of another.
2929
void fragmentWholeToPartial()
@@ -38,7 +38,7 @@ void fragmentWholeToPartial()
3838
__builtin_memcpy(&dest.num1, &src, 5);
3939
}
4040
// CHECK: call void @llvm.memcpy{{.+}}, !DIAssignID ![[exceed:[0-9]+]]
41-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata{{.*}}undef, metadata !{{[0-9]+}}, metadata !DIExpression(DW_OP_LLVM_fragment, 0, 40), metadata ![[exceed]], metadata ptr %num1, metadata !DIExpression())
41+
// CHECK-NEXT: #dbg_assign({{.*}}undef, !{{[0-9]+}}, !DIExpression(DW_OP_LLVM_fragment, 0, 40), ![[exceed]], ptr %num1, !DIExpression(),
4242

4343
// Write starting between fields.
4444
void fragmentPartialToWhole()
@@ -54,4 +54,4 @@ void fragmentPartialToWhole()
5454
__builtin_memcpy((char*)&(dest.num2) + 3, &src, 5);
5555
}
5656
// CHECK: call void @llvm.memcpy{{.+}}, !DIAssignID ![[addendID:[0-9]+]]
57-
// CHECK-NEXT: call void @llvm.dbg.assign(metadata{{.*}}undef, metadata !{{.*}}, metadata !DIExpression(DW_OP_LLVM_fragment, 56, 40), metadata ![[addendID]], metadata ptr %add.ptr, metadata !DIExpression())
57+
// CHECK-NEXT: #dbg_assign({{.*}}undef, !{{.*}}, !DIExpression(DW_OP_LLVM_fragment, 56, 40), ![[addendID]], ptr %add.ptr, !DIExpression(),

‎clang/test/CodeGen/assignment-tracking/nested-scope.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Check that dbg.assign intrinsics get a !dbg with with the same scope as
77
// their variable.
88

9-
// CHECK: call void @llvm.dbg.assign({{.+}}, metadata [[local:![0-9]+]], {{.+}}, {{.+}}, {{.+}}), !dbg [[dbg:![0-9]+]]
9+
// CHECK: #dbg_assign({{.+}}, [[local:![0-9]+]], {{.+}}, {{.+}}, {{.+}}, [[dbg:![0-9]+]]
1010
// CHECK-DAG: [[local]] = !DILocalVariable(name: "local", scope: [[scope:![0-9]+]],
1111
// CHECK-DAG: [[dbg]] = !DILocation({{.+}}, scope: [[scope]])
1212
// CHECK-DAG: [[scope]] = distinct !DILexicalBlock

‎clang/test/CodeGen/attr-nodebug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ void t2(void)
2121

2222
// Verify those things do occur normally.
2323
// CHECK-LABEL: @t2
24-
// CHECK: call{{.*}}llvm.dbg
24+
// CHECK: #dbg_declare
2525
// CHECK: !dbg
2626
// CHECK: }
2727

‎clang/test/CodeGen/debug-info-block-decl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// CHECK: define{{.*}}@main()
55
// CHECK: store {{.*}}, !dbg ![[ASSIGNMENT:[0-9]+]]
66
// CHECK: define {{.*}} @__main_block_invoke
7-
// CHECK: , !dbg ![[BLOCK_ENTRY:[0-9]+]]
7+
// CHECK: , ![[BLOCK_ENTRY:[0-9]+]])
88

99
int main(void)
1010
{

‎clang/test/CodeGen/debug-info-block-expr.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ void noEscapeFunc(__attribute__((noescape)) BlockTy);
1010
// 'noescape') blocks.
1111
void test_escape_func(void) {
1212
// CHECK-LABEL: void @test_escape_func
13-
// CHECK: call void @llvm.dbg.declare({{.*}}metadata ![[ESCAPE_VAR:[0-9]+]], metadata !DIExpression(DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}}){{.*}})
13+
// CHECK: #dbg_declare({{.*}}![[ESCAPE_VAR:[0-9]+]], !DIExpression(DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}}){{.*}})
1414
__block int escape_var;
1515
// Blocks in dead code branches still capture __block variables.
1616
#ifdef DEAD_CODE
@@ -22,27 +22,27 @@ void test_escape_func(void) {
2222
// Verify that the desired DIExpression are generated for noescape blocks.
2323
void test_noescape_func(void) {
2424
// CHECK-LABEL: void @test_noescape_func
25-
// CHECK: call void @llvm.dbg.declare({{.*}}metadata ![[NOESCAPE_VAR:[0-9]+]], metadata !DIExpression())
25+
// CHECK: #dbg_declare({{.*}}![[NOESCAPE_VAR:[0-9]+]], !DIExpression(),
2626
__block int noescape_var;
2727
noEscapeFunc(^{ (void)noescape_var; });
2828
}
2929

3030
// Verify that the desired DIExpression are generated for blocks.
3131
void test_local_block(void) {
3232
// CHECK-LABEL: void @test_local_block
33-
// CHECK: call void @llvm.dbg.declare({{.*}}metadata ![[BLOCK_VAR:[0-9]+]], metadata !DIExpression(DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}}){{.*}})
33+
// CHECK: #dbg_declare({{.*}}![[BLOCK_VAR:[0-9]+]], !DIExpression(DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}}){{.*}})
3434
__block int block_var;
3535

3636
// CHECK-LABEL: @__test_local_block_block_invoke
37-
// CHECK: call void @llvm.dbg.declare({{.*}}!DIExpression(DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}}){{.*}})
37+
// CHECK: #dbg_declare({{.*}}!DIExpression(DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}}, DW_OP_deref, DW_OP_plus_uconst, {{[0-9]+}}){{.*}})
3838
^ { block_var = 1; }();
3939
}
4040

4141
// Verify that the desired DIExpression are generated for __block vars not used
4242
// in any block.
4343
void test_unused(void) {
4444
// CHECK-LABEL: void @test_unused
45-
// CHECK: call void @llvm.dbg.declare({{.*}}metadata ![[UNUSED_VAR:[0-9]+]], metadata !DIExpression())
45+
// CHECK: #dbg_declare({{.*}}![[UNUSED_VAR:[0-9]+]], !DIExpression(),
4646
__block int unused_var;
4747
// Use i (not inside a block).
4848
++unused_var;

‎clang/test/CodeGen/debug-info-block-vars.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
// CHECK: %.block_descriptor.addr = alloca ptr, align 8
99
// CHECK: %block.addr = alloca ptr, align 8
1010
// CHECK: store ptr %.block_descriptor, ptr %.block_descriptor.addr, align 8
11-
// CHECK: call void @llvm.dbg.declare(metadata ptr %.block_descriptor.addr,
12-
// CHECK-SAME: metadata !DIExpression())
11+
// CHECK: #dbg_declare(ptr %.block_descriptor.addr,
12+
// CHECK-SAME: !DIExpression(),
1313
// CHECK-OPT-NOT: alloca
1414
// Since the block address is not used anywhere in this function,
1515
// the optimizer (DeadArgElim) has replaced all the false uses
1616
// (i.e., metadata users) with poison.
17-
// CHECK-OPT: call void @llvm.dbg.value(metadata ptr poison,
18-
// CHECK-OPT-SAME: metadata !DIExpression())
17+
// CHECK-OPT: #dbg_value(ptr poison,
18+
// CHECK-OPT-SAME: !DIExpression(),
1919
void f(void) {
2020
a(^{
2121
b();

‎clang/test/CodeGen/debug-info-matrix-types.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
typedef double dx2x3_t __attribute__((matrix_type(2, 3)));
44

55
void load_store_double(dx2x3_t *a, dx2x3_t *b) {
6-
// CHECK-DAG: @llvm.dbg.declare(metadata ptr %a.addr, metadata [[EXPR_A:![0-9]+]]
7-
// CHECK-DAG: @llvm.dbg.declare(metadata ptr %b.addr, metadata [[EXPR_B:![0-9]+]]
6+
// CHECK-DAG: #dbg_declare(ptr %a.addr, [[EXPR_A:![0-9]+]]
7+
// CHECK-DAG: #dbg_declare(ptr %b.addr, [[EXPR_B:![0-9]+]]
88
// CHECK: [[PTR_TY:![0-9]+]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: [[TYPEDEF:![0-9]+]], size: 64)
99
// CHECK: [[TYPEDEF]] = !DIDerivedType(tag: DW_TAG_typedef, name: "dx2x3_t", {{.+}} baseType: [[MATRIX_TY:![0-9]+]])
1010
// CHECK: [[MATRIX_TY]] = !DICompositeType(tag: DW_TAG_array_type, baseType: [[ELT_TY:![0-9]+]], size: 384, elements: [[ELEMENTS:![0-9]+]])

‎clang/test/CodeGen/debug-info-vla.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
void testVLAwithSize(int s)
44
{
5-
// CHECK-DAG: dbg.declare({{.*}} %__vla_expr0, metadata ![[VLAEXPR:[0-9]+]]
6-
// CHECK-DAG: dbg.declare({{.*}} %vla, metadata ![[VAR:[0-9]+]]
5+
// CHECK-DAG: #dbg_declare({{.*}} %__vla_expr0, ![[VLAEXPR:[0-9]+]]
6+
// CHECK-DAG: #dbg_declare({{.*}} %vla, ![[VAR:[0-9]+]]
77
// CHECK-DAG: ![[VLAEXPR]] = !DILocalVariable(name: "__vla_expr0", {{.*}} flags: DIFlagArtificial
88
// CHECK-DAG: ![[VAR]] = !DILocalVariable(name: "vla",{{.*}} line: [[@LINE+2]]
99
// CHECK-DAG: !DISubrange(count: ![[VLAEXPR]])

‎clang/test/CodeGen/debug-label-inline.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ int f2(void) {
1616
int result;
1717

1818
result = f1(ga, gb);
19-
// CHECK: call void @llvm.dbg.label(metadata [[LABEL_METADATA:!.*]]), !dbg [[LABEL_LOCATION:!.*]]
19+
// CHECK: #dbg_label([[LABEL_METADATA:!.*]], [[LABEL_LOCATION:![0-9]+]]
2020

2121
return result;
2222
}

‎clang/test/CodeGen/debug-label.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ int f1(int a, int b) {
77
int sum;
88

99
top:
10-
// CHECK: call void @llvm.dbg.label(metadata [[LABEL_METADATA:!.*]]), !dbg [[LABEL_LOCATION:!.*]]
10+
// CHECK: #dbg_label([[LABEL_METADATA:!.*]], [[LABEL_LOCATION:![0-9]+]]
1111
sum = a + b;
1212
return sum;
1313
}

‎clang/test/CodeGen/instrument-objc-method.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ + (void)load __attribute__((no_instrument_function)) {
2020
- (void)dealloc __attribute__((no_instrument_function)) {
2121
}
2222

23-
// PREINLINE: declare void @llvm.dbg.declare(metadata, metadata, metadata) #2
2423
// PREINLINE: attributes #0 = { {{.*}}"instrument-function-entry"="__cyg_profile_func_enter"
2524
// PREINLINE-NOT: attributes #0 = { {{.*}}"instrument-function-entry"="__cyg_profile_func_enter_bare"
2625
// PREINLINE-NOT: attributes #2 = { {{.*}}"__cyg_profile_func_enter"

‎clang/test/CodeGenCUDA/debug-info-address-class.cu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ __device__ __constant__ int FileVar2;
1414

1515
__device__ void kernel1(
1616
// CHECK-DAG: ![[ARG:[0-9]+]] = !DILocalVariable(name: "Arg", arg: {{[0-9]+}}, scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}})
17-
// CHECK-DAG: call void @llvm.dbg.declare(metadata ptr {{.*}}, metadata ![[ARG]], metadata !DIExpression()), !dbg !{{[0-9]+}}
17+
// CHECK-DAG: #dbg_declare(ptr {{.*}}, ![[ARG]], !DIExpression(), !{{[0-9]+}}
1818
int Arg) {
1919
// CHECK-DAG: ![[FUNCVAR0:[0-9]+]] = distinct !DIGlobalVariable(name: "FuncVar0", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}}, isLocal: true, isDefinition: true)
2020
// CHECK-DAG: !DIGlobalVariableExpression(var: ![[FUNCVAR0]], expr: !DIExpression(DW_OP_constu, 8, DW_OP_swap, DW_OP_xderef))
2121
__shared__ int FuncVar0;
2222
// CHECK-DAG: ![[FUNCVAR1:[0-9]+]] = !DILocalVariable(name: "FuncVar1", scope: !{{[0-9]+}}, file: !{{[0-9]+}}, line: {{[0-9]+}}, type: !{{[0-9]+}})
23-
// CHECK-DAG: call void @llvm.dbg.declare(metadata ptr {{.*}}, metadata ![[FUNCVAR1]], metadata !DIExpression()), !dbg !{{[0-9]+}}
23+
// CHECK-DAG: #dbg_declare(ptr {{.*}}, ![[FUNCVAR1]], !DIExpression(), !{{[0-9]+}}
2424
int FuncVar1;
2525
}

‎clang/test/CodeGenCXX/debug-info-inheriting-constructor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ struct B : A {
1010
A::A(int i, ...) {}
1111
// CHECK: define{{.*}} void @{{.*}}foo
1212
// CHECK-NOT: ret void
13-
// CHECK: call void @llvm.dbg.declare
13+
// CHECK: #dbg_declare
1414
// CHECK-NOT: ret void
15-
// CHECK: call void @llvm.dbg.declare(metadata ptr %{{[^,]+}},
16-
// CHECK-SAME: metadata ![[THIS:[0-9]+]], metadata !DIExpression()), !dbg ![[LOC:[0-9]+]]
15+
// CHECK: #dbg_declare(ptr %{{[^,]+}},
16+
// CHECK-SAME: ![[THIS:[0-9]+]], !DIExpression(), ![[LOC:[0-9]+]]
1717
// CHECK: ret void, !dbg ![[NOINL:[0-9]+]]
1818
// CHECK: ![[FOO:.*]] = distinct !DISubprogram(name: "foo"
1919
// CHECK-DAG: ![[A:.*]] = distinct !DISubprogram(name: "A", linkageName: "_ZN1BCI11AEiz"

‎clang/test/CodeGenCXX/debug-info-nrvo.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ int main() {
2727
// stored in the return register.
2828

2929
// CHECK: %[[RESULT:.*]] = alloca ptr, align 8
30-
// CHECK: call void @llvm.dbg.declare(metadata ptr %[[RESULT]],
31-
// CHECK-SAME: metadata !DIExpression(DW_OP_deref)
30+
// CHECK: #dbg_declare(ptr %[[RESULT]],
31+
// CHECK-SAME: !DIExpression(DW_OP_deref)
3232

3333
// NOELIDE: %[[FOO:.*]] = alloca %struct.Foo, align 4
34-
// NOELIDE: call void @llvm.dbg.declare(metadata ptr %[[FOO]],
35-
// NOELIDE-SAME: metadata !DIExpression()
34+
// NOELIDE: #dbg_declare(ptr %[[FOO]],
35+
// NOELIDE-SAME: !DIExpression()

‎clang/test/CodeGenCXX/debug-info-range-for-var-names.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ void test() {
1515
}
1616
}
1717

18-
// CHECK: call void @llvm.dbg.declare(metadata ptr %__range1, metadata ![[RANGE1:[0-9]+]]
19-
// CHECK: call void @llvm.dbg.declare(metadata ptr {{.*}}, metadata ![[BEGIN1:[0-9]+]]
20-
// CHECK: call void @llvm.dbg.declare(metadata ptr {{.*}}, metadata ![[END1:[0-9]+]]
21-
// CHECK: call void @llvm.dbg.declare(metadata ptr %__range2, metadata ![[RANGE2:[0-9]+]]
22-
// CHECK: call void @llvm.dbg.declare(metadata ptr {{.*}}, metadata ![[BEGIN2:[0-9]+]]
23-
// CHECK: call void @llvm.dbg.declare(metadata ptr {{.*}}, metadata ![[END2:[0-9]+]]
24-
// CHECK: call void @llvm.dbg.declare(metadata ptr %__range3, metadata ![[RANGE3:[0-9]+]]
25-
// CHECK: call void @llvm.dbg.declare(metadata ptr {{.*}}, metadata ![[BEGIN3:[0-9]+]]
26-
// CHECK: call void @llvm.dbg.declare(metadata ptr {{.*}}, metadata ![[END3:[0-9]+]]
18+
// CHECK: #dbg_declare(ptr %__range1, ![[RANGE1:[0-9]+]]
19+
// CHECK: #dbg_declare(ptr {{[^,]*}}, ![[BEGIN1:[0-9]+]]
20+
// CHECK: #dbg_declare(ptr {{[^,]*}}, ![[END1:[0-9]+]]
21+
// CHECK: #dbg_declare(ptr %__range2, ![[RANGE2:[0-9]+]]
22+
// CHECK: #dbg_declare(ptr {{[^,]*}}, ![[BEGIN2:[0-9]+]]
23+
// CHECK: #dbg_declare(ptr {{[^,]*}}, ![[END2:[0-9]+]]
24+
// CHECK: #dbg_declare(ptr %__range3, ![[RANGE3:[0-9]+]]
25+
// CHECK: #dbg_declare(ptr {{[^,]*}}, ![[BEGIN3:[0-9]+]]
26+
// CHECK: #dbg_declare(ptr {{[^,]*}}, ![[END3:[0-9]+]]
2727
// CHECK: ![[RANGE1]] = !DILocalVariable(name: "__range1",
2828
// CHECK: ![[BEGIN1]] = !DILocalVariable(name: "__begin1",
2929
// CHECK: ![[END1]] = !DILocalVariable(name: "__end1",

0 commit comments

Comments
 (0)