diff options
| author | bors <bors@rust-lang.org> | 2022-01-15 10:57:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-15 10:57:03 +0000 |
| commit | b13a5bf3c4d66ce375f5978c2c2233f9714b721e (patch) | |
| tree | ff0a003ba0175b321403bff0885636893e33b818 /src/test/codegen | |
| parent | 38c22af0153cf8f920c01ef04493e8878401fd18 (diff) | |
| parent | 539175c026c70e32150ca8c5ed2e0bacd3bb12e6 (diff) | |
Auto merge of #92927 - matthiaskrgr:rollup-pgzwfcm, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #92747 (Simplification of BigNum::bit_length) - #92767 (Use the new language identifier for Rust in the PDB debug format) - #92775 (Inline std::os::unix::ffi::OsStringExt methods) - #92863 (Remove `&mut` from `io::read_to_string` signature) - #92865 (Ignore static lifetimes for GATs outlives lint) - #92873 (Generate more precise generator names) - #92879 (Add Sync bound to allocator parameter in vec::IntoIter) - #92892 (Do not fail evaluation in const blocks) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/async-fn-debug-msvc.rs | 2 | ||||
| -rw-r--r-- | src/test/codegen/async-fn-debug.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/codegen/async-fn-debug-msvc.rs b/src/test/codegen/async-fn-debug-msvc.rs index 0c16b9ad3ab..bb0db9d3d85 100644 --- a/src/test/codegen/async-fn-debug-msvc.rs +++ b/src/test/codegen/async-fn-debug-msvc.rs @@ -17,7 +17,7 @@ async fn async_fn_test() { // FIXME: No way to reliably check the filename. // CHECK-DAG: [[ASYNC_FN:!.*]] = !DINamespace(name: "async_fn_test" -// CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_union_type, name: "generator$0" +// CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_union_type, name: "async_fn$0" // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "variant0", scope: [[GEN]], // For brevity, we only check the struct name and members of the last variant. // CHECK-SAME: file: [[FILE:![0-9]*]], line: 11, diff --git a/src/test/codegen/async-fn-debug.rs b/src/test/codegen/async-fn-debug.rs index 39319a3ea72..f456f7ffc0f 100644 --- a/src/test/codegen/async-fn-debug.rs +++ b/src/test/codegen/async-fn-debug.rs @@ -17,7 +17,7 @@ async fn async_fn_test() { // FIXME: No way to reliably check the filename. // CHECK-DAG: [[ASYNC_FN:!.*]] = !DINamespace(name: "async_fn_test" -// CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "{generator#0}", scope: [[ASYNC_FN]] +// CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "{async_fn#0}", scope: [[ASYNC_FN]] // CHECK: [[VARIANT:!.*]] = !DICompositeType(tag: DW_TAG_variant_part, scope: [[ASYNC_FN]], // CHECK-NOT: flags: DIFlagArtificial // CHECK-SAME: discriminator: [[DISC:![0-9]*]] |