Skip to content

Commit 94c45ef

Browse files
committed
Update generator tests
1 parent 3127419 commit 94c45ef

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

src/test/codegen/async-fn-debug-msvc.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,33 @@ async fn async_fn_test() {
1717
// FIXME: No way to reliably check the filename.
1818

1919
// CHECK-DAG: [[ASYNC_FN:!.*]] = !DINamespace(name: "async_fn_test"
20-
// CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_union_type, name: "generator-0", scope: [[ASYNC_FN]]
21-
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
20+
// CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_union_type, name: "generator-0"
21+
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant0", scope: [[GEN]],
2222
// For brevity, we only check the struct name and members of the last variant.
2323
// CHECK-SAME: file: [[FILE:![0-9]*]], line: 11,
2424
// CHECK-NOT: flags: DIFlagArtificial
2525
// CHECK-SAME: )
26-
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
26+
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant1", scope: [[GEN]],
2727
// CHECK-SAME: file: [[FILE]], line: 15,
2828
// CHECK-NOT: flags: DIFlagArtificial
2929
// CHECK-SAME: )
30-
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
30+
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant2", scope: [[GEN]],
3131
// CHECK-SAME: file: [[FILE]], line: 15,
3232
// CHECK-NOT: flags: DIFlagArtificial
3333
// CHECK-SAME: )
34-
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
34+
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant3", scope: [[GEN]],
3535
// CHECK-SAME: file: [[FILE]], line: 12,
3636
// CHECK-NOT: flags: DIFlagArtificial
3737
// CHECK-SAME: )
38-
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
38+
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant4", scope: [[GEN]],
3939
// CHECK-SAME: file: [[FILE]], line: 14,
4040
// CHECK-SAME: baseType: [[VARIANT:![0-9]*]]
4141
// CHECK-NOT: flags: DIFlagArtificial
4242
// CHECK-SAME: )
43-
// CHECK: [[S1:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Suspend1", scope: [[ASYNC_FN]],
43+
// CHECK: [[S1:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Suspend1", scope: [[GEN]],
4444
// CHECK-NOT: flags: DIFlagArtificial
4545
// CHECK-SAME: )
46-
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "RUST$ENUM$DISR", scope: [[S1]],
46+
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant$", scope: [[S1]],
4747
// CHECK-SAME: flags: DIFlagArtificial
4848
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "s", scope: [[S1]]
4949
// CHECK-NOT: flags: DIFlagArtificial

src/test/codegen/generator-debug-msvc.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,33 @@ fn generator_test() -> impl Generator<Yield = i32, Return = ()> {
2121
// FIXME: No way to reliably check the filename.
2222

2323
// CHECK-DAG: [[GEN_FN:!.*]] = !DINamespace(name: "generator_test"
24-
// CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_union_type, name: "generator-0", scope: [[GEN_FN]]
25-
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
24+
// CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_union_type, name: "generator-0"
25+
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant0", scope: [[GEN]],
2626
// For brevity, we only check the struct name and members of the last variant.
2727
// CHECK-SAME: file: [[FILE:![0-9]*]], line: 14,
2828
// CHECK-NOT: flags: DIFlagArtificial
2929
// CHECK-SAME: )
30-
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
30+
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant1", scope: [[GEN]],
3131
// CHECK-SAME: file: [[FILE]], line: 18,
3232
// CHECK-NOT: flags: DIFlagArtificial
3333
// CHECK-SAME: )
34-
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
34+
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant2", scope: [[GEN]],
3535
// CHECK-SAME: file: [[FILE]], line: 18,
3636
// CHECK-NOT: flags: DIFlagArtificial
3737
// CHECK-SAME: )
38-
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
38+
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant3", scope: [[GEN]],
3939
// CHECK-SAME: file: [[FILE]], line: 15,
4040
// CHECK-NOT: flags: DIFlagArtificial
4141
// CHECK-SAME: )
42-
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
42+
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant4", scope: [[GEN]],
4343
// CHECK-SAME: file: [[FILE]], line: 17,
4444
// CHECK-SAME: baseType: [[VARIANT:![0-9]*]]
4545
// CHECK-NOT: flags: DIFlagArtificial
4646
// CHECK-SAME: )
47-
// CHECK: [[S1:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Suspend1", scope: [[GEN_FN]],
47+
// CHECK: [[S1:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Suspend1", scope: [[GEN]],
4848
// CHECK-NOT: flags: DIFlagArtificial
4949
// CHECK-SAME: )
50-
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "RUST$ENUM$DISR", scope: [[S1]],
50+
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant$", scope: [[S1]],
5151
// CHECK-SAME: flags: DIFlagArtificial
5252
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "s", scope: [[S1]]
5353
// CHECK-NOT: flags: DIFlagArtificial

0 commit comments

Comments
 (0)