From ef24de24a82fe681581cc130f342363c47c0969a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 7 Jun 2024 07:48:48 +0200 Subject: Merging upstream version 1.75.0+dfsg1. Signed-off-by: Daniel Baumann --- tests/ui/print_type_sizes/coroutine.rs | 18 ++++++++++++++++ tests/ui/print_type_sizes/coroutine.stdout | 10 +++++++++ .../print_type_sizes/coroutine_discr_placement.rs | 24 ++++++++++++++++++++++ .../coroutine_discr_placement.stdout | 11 ++++++++++ tests/ui/print_type_sizes/generator.rs | 18 ---------------- tests/ui/print_type_sizes/generator.stdout | 10 --------- .../print_type_sizes/generator_discr_placement.rs | 24 ---------------------- .../generator_discr_placement.stdout | 11 ---------- 8 files changed, 63 insertions(+), 63 deletions(-) create mode 100644 tests/ui/print_type_sizes/coroutine.rs create mode 100644 tests/ui/print_type_sizes/coroutine.stdout create mode 100644 tests/ui/print_type_sizes/coroutine_discr_placement.rs create mode 100644 tests/ui/print_type_sizes/coroutine_discr_placement.stdout delete mode 100644 tests/ui/print_type_sizes/generator.rs delete mode 100644 tests/ui/print_type_sizes/generator.stdout delete mode 100644 tests/ui/print_type_sizes/generator_discr_placement.rs delete mode 100644 tests/ui/print_type_sizes/generator_discr_placement.stdout (limited to 'tests/ui/print_type_sizes') diff --git a/tests/ui/print_type_sizes/coroutine.rs b/tests/ui/print_type_sizes/coroutine.rs new file mode 100644 index 000000000..aae72e0f3 --- /dev/null +++ b/tests/ui/print_type_sizes/coroutine.rs @@ -0,0 +1,18 @@ +// compile-flags: -Z print-type-sizes --crate-type=lib +// build-pass +// ignore-pass + +#![feature(coroutines, coroutine_trait)] + +use std::ops::Coroutine; + +fn coroutine(array: [u8; C]) -> impl Coroutine { + move |()| { + yield (); + let _ = array; + } +} + +pub fn foo() { + let _ = coroutine([0; 8192]); +} diff --git a/tests/ui/print_type_sizes/coroutine.stdout b/tests/ui/print_type_sizes/coroutine.stdout new file mode 100644 index 000000000..5d5133955 --- /dev/null +++ b/tests/ui/print_type_sizes/coroutine.stdout @@ -0,0 +1,10 @@ +print-type-size type: `{coroutine@$DIR/coroutine.rs:10:5: 10:14}`: 8193 bytes, alignment: 1 bytes +print-type-size discriminant: 1 bytes +print-type-size variant `Unresumed`: 8192 bytes +print-type-size upvar `.array`: 8192 bytes +print-type-size variant `Suspend0`: 8192 bytes +print-type-size upvar `.array`: 8192 bytes +print-type-size variant `Returned`: 8192 bytes +print-type-size upvar `.array`: 8192 bytes +print-type-size variant `Panicked`: 8192 bytes +print-type-size upvar `.array`: 8192 bytes diff --git a/tests/ui/print_type_sizes/coroutine_discr_placement.rs b/tests/ui/print_type_sizes/coroutine_discr_placement.rs new file mode 100644 index 000000000..78fe75cde --- /dev/null +++ b/tests/ui/print_type_sizes/coroutine_discr_placement.rs @@ -0,0 +1,24 @@ +// compile-flags: -Z print-type-sizes --crate-type lib +// build-pass +// ignore-pass + +// Tests a coroutine that has its discriminant as the *final* field. + +// Avoid emitting panic handlers, like the rest of these tests... +#![feature(coroutines)] +#![allow(dropping_copy_types)] + +pub fn foo() { + let a = || { + { + let w: i32 = 4; + yield; + drop(w); + } + { + let z: i32 = 7; + yield; + drop(z); + } + }; +} diff --git a/tests/ui/print_type_sizes/coroutine_discr_placement.stdout b/tests/ui/print_type_sizes/coroutine_discr_placement.stdout new file mode 100644 index 000000000..f34a8e9a7 --- /dev/null +++ b/tests/ui/print_type_sizes/coroutine_discr_placement.stdout @@ -0,0 +1,11 @@ +print-type-size type: `{coroutine@$DIR/coroutine_discr_placement.rs:12:13: 12:15}`: 8 bytes, alignment: 4 bytes +print-type-size discriminant: 1 bytes +print-type-size variant `Unresumed`: 0 bytes +print-type-size variant `Suspend0`: 7 bytes +print-type-size padding: 3 bytes +print-type-size local `.w`: 4 bytes, alignment: 4 bytes +print-type-size variant `Suspend1`: 7 bytes +print-type-size padding: 3 bytes +print-type-size local `.z`: 4 bytes, alignment: 4 bytes +print-type-size variant `Returned`: 0 bytes +print-type-size variant `Panicked`: 0 bytes diff --git a/tests/ui/print_type_sizes/generator.rs b/tests/ui/print_type_sizes/generator.rs deleted file mode 100644 index d1cd36274..000000000 --- a/tests/ui/print_type_sizes/generator.rs +++ /dev/null @@ -1,18 +0,0 @@ -// compile-flags: -Z print-type-sizes --crate-type=lib -// build-pass -// ignore-pass - -#![feature(generators, generator_trait)] - -use std::ops::Generator; - -fn generator(array: [u8; C]) -> impl Generator { - move |()| { - yield (); - let _ = array; - } -} - -pub fn foo() { - let _ = generator([0; 8192]); -} diff --git a/tests/ui/print_type_sizes/generator.stdout b/tests/ui/print_type_sizes/generator.stdout deleted file mode 100644 index f8c52a595..000000000 --- a/tests/ui/print_type_sizes/generator.stdout +++ /dev/null @@ -1,10 +0,0 @@ -print-type-size type: `{generator@$DIR/generator.rs:10:5: 10:14}`: 8193 bytes, alignment: 1 bytes -print-type-size discriminant: 1 bytes -print-type-size variant `Unresumed`: 8192 bytes -print-type-size upvar `.array`: 8192 bytes -print-type-size variant `Suspend0`: 8192 bytes -print-type-size upvar `.array`: 8192 bytes -print-type-size variant `Returned`: 8192 bytes -print-type-size upvar `.array`: 8192 bytes -print-type-size variant `Panicked`: 8192 bytes -print-type-size upvar `.array`: 8192 bytes diff --git a/tests/ui/print_type_sizes/generator_discr_placement.rs b/tests/ui/print_type_sizes/generator_discr_placement.rs deleted file mode 100644 index 6adc14f9b..000000000 --- a/tests/ui/print_type_sizes/generator_discr_placement.rs +++ /dev/null @@ -1,24 +0,0 @@ -// compile-flags: -Z print-type-sizes --crate-type lib -// build-pass -// ignore-pass - -// Tests a generator that has its discriminant as the *final* field. - -// Avoid emitting panic handlers, like the rest of these tests... -#![feature(generators)] -#![allow(dropping_copy_types)] - -pub fn foo() { - let a = || { - { - let w: i32 = 4; - yield; - drop(w); - } - { - let z: i32 = 7; - yield; - drop(z); - } - }; -} diff --git a/tests/ui/print_type_sizes/generator_discr_placement.stdout b/tests/ui/print_type_sizes/generator_discr_placement.stdout deleted file mode 100644 index f7bdee111..000000000 --- a/tests/ui/print_type_sizes/generator_discr_placement.stdout +++ /dev/null @@ -1,11 +0,0 @@ -print-type-size type: `{generator@$DIR/generator_discr_placement.rs:12:13: 12:15}`: 8 bytes, alignment: 4 bytes -print-type-size discriminant: 1 bytes -print-type-size variant `Unresumed`: 0 bytes -print-type-size variant `Suspend0`: 7 bytes -print-type-size padding: 3 bytes -print-type-size local `.w`: 4 bytes, alignment: 4 bytes -print-type-size variant `Suspend1`: 7 bytes -print-type-size padding: 3 bytes -print-type-size local `.z`: 4 bytes, alignment: 4 bytes -print-type-size variant `Returned`: 0 bytes -print-type-size variant `Panicked`: 0 bytes -- cgit v1.2.3