Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 72 deletions

diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs b/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs
deleted file mode 100644
index a473c5c97..000000000
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-#![feature(rustc_attrs)]
-
-// Regression test for #56877. We want to ensure that the presence of
-// `PhantomData` does not prevent `Bar` from being considered a
-// homogeneous aggregate.
-
-#[repr(C)]
-pub struct BaseCase {
-    pub a: f32,
-    pub b: f32,
-}
-
-#[repr(C)]
-pub struct WithPhantomData {
-    pub a: f32,
-    pub b: f32,
-    pub _unit: std::marker::PhantomData<()>,
-}
-
-pub struct EmptyRustStruct {}
-
-#[repr(C)]
-pub struct WithEmptyRustStruct {
-    pub a: f32,
-    pub b: f32,
-    pub _unit: EmptyRustStruct,
-}
-
-pub struct TransitivelyEmptyRustStruct {
-    field: EmptyRustStruct,
-    array: [u32; 0],
-}
-
-#[repr(C)]
-pub struct WithTransitivelyEmptyRustStruct {
-    pub a: f32,
-    pub b: f32,
-    pub _unit: TransitivelyEmptyRustStruct,
-}
-
-pub enum EmptyRustEnum {
-    Dummy,
-}
-
-#[repr(C)]
-pub struct WithEmptyRustEnum {
-    pub a: f32,
-    pub b: f32,
-    pub _unit: EmptyRustEnum,
-}
-
-#[rustc_layout(homogeneous_aggregate)]
-pub type Test1 = BaseCase;
-//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
-
-#[rustc_layout(homogeneous_aggregate)]
-pub type Test2 = WithPhantomData;
-//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
-
-#[rustc_layout(homogeneous_aggregate)]
-pub type Test3 = WithEmptyRustStruct;
-//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
-
-#[rustc_layout(homogeneous_aggregate)]
-pub type Test4 = WithTransitivelyEmptyRustStruct;
-//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
-
-#[rustc_layout(homogeneous_aggregate)]
-pub type Test5 = WithEmptyRustEnum;
-//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
-
-fn main() {}