From 64d98f8ee037282c35007b64c2649055c56af1db Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:03 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 tests/ui/structs-enums/rec-align-u32.rs | 57 +++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 tests/ui/structs-enums/rec-align-u32.rs

(limited to 'tests/ui/structs-enums/rec-align-u32.rs')

diff --git a/tests/ui/structs-enums/rec-align-u32.rs b/tests/ui/structs-enums/rec-align-u32.rs
new file mode 100644
index 000000000..ee704198d
--- /dev/null
+++ b/tests/ui/structs-enums/rec-align-u32.rs
@@ -0,0 +1,57 @@
+// run-pass
+#![allow(dead_code)]
+#![allow(unused_unsafe)]
+// Issue #2303
+
+#![feature(intrinsics)]
+
+use std::mem;
+
+mod rusti {
+    extern "rust-intrinsic" {
+        pub fn pref_align_of<T>() -> usize;
+        #[rustc_safe_intrinsic]
+        pub fn min_align_of<T>() -> usize;
+    }
+}
+
+// This is the type with the questionable alignment
+#[derive(Debug)]
+struct Inner {
+    c64: u32
+}
+
+// This is the type that contains the type with the
+// questionable alignment, for testing
+#[derive(Debug)]
+struct Outer {
+    c8: u8,
+    t: Inner
+}
+
+mod m {
+    pub fn align() -> usize { 4 }
+    pub fn size() -> usize { 8 }
+}
+
+pub fn main() {
+    unsafe {
+        let x = Outer {c8: 22, t: Inner {c64: 44}};
+
+        // Send it through the shape code
+        let y = format!("{:?}", x);
+
+        println!("align inner = {:?}", rusti::min_align_of::<Inner>());
+        println!("size outer = {:?}", mem::size_of::<Outer>());
+        println!("y = {:?}", y);
+
+        // per clang/gcc the alignment of `inner` is 4 on x86.
+        assert_eq!(rusti::min_align_of::<Inner>(), m::align());
+
+        // per clang/gcc the size of `outer` should be 12
+        // because `inner`s alignment was 4.
+        assert_eq!(mem::size_of::<Outer>(), m::size());
+
+        assert_eq!(y, "Outer { c8: 22, t: Inner { c64: 44 } }".to_string());
+    }
+}
-- 
cgit v1.2.3