From 8a8d32cef440a5cb574c71bc84b5f906a8fdeae7 Mon Sep 17 00:00:00 2001
From: Amanieu d'Antras <amanieu@gmail.com>
Date: Tue, 31 Oct 2023 23:06:00 +0000
Subject: [PATCH 1/3] Update feature names for new stdarch

---
 tests/pass/intrinsics-x86-aes-vaes.rs | 2 +-
 tests/pass/intrinsics-x86-avx512.rs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/pass/intrinsics-x86-aes-vaes.rs b/tests/pass/intrinsics-x86-aes-vaes.rs
index 55d1bacdf4..7363c75361 100644
--- a/tests/pass/intrinsics-x86-aes-vaes.rs
+++ b/tests/pass/intrinsics-x86-aes-vaes.rs
@@ -9,7 +9,7 @@
 //@ignore-target-wasm32
 //@compile-flags: -C target-feature=+aes,+vaes,+avx512f
 
-#![feature(avx512_target_feature, stdsimd)]
+#![feature(avx512_target_feature, stdarch_x86_avx512)]
 
 use core::mem::transmute;
 #[cfg(target_arch = "x86")]
diff --git a/tests/pass/intrinsics-x86-avx512.rs b/tests/pass/intrinsics-x86-avx512.rs
index 394412a235..66bfcb20f1 100644
--- a/tests/pass/intrinsics-x86-avx512.rs
+++ b/tests/pass/intrinsics-x86-avx512.rs
@@ -10,7 +10,7 @@
 //@compile-flags: -C target-feature=+avx512f,+avx512vl,+avx512bitalg,+avx512vpopcntdq
 
 #![feature(avx512_target_feature)]
-#![feature(stdsimd)]
+#![feature(stdarch_x86_avx512)]
 
 #[cfg(target_arch = "x86")]
 use std::arch::x86::*;

From 8ee8d26e1a2131035bef4e3269f91667a99dd8e3 Mon Sep 17 00:00:00 2001
From: Lukas Markeffsky <@>
Date: Fri, 2 Feb 2024 21:27:50 +0100
Subject: [PATCH 2/3] miri: normalize struct tail in ABI compat check

---
 .../issue-miri-3282-struct-tail-normalize.rs  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 tests/pass/issues/issue-miri-3282-struct-tail-normalize.rs

diff --git a/tests/pass/issues/issue-miri-3282-struct-tail-normalize.rs b/tests/pass/issues/issue-miri-3282-struct-tail-normalize.rs
new file mode 100644
index 0000000000..2a31df8384
--- /dev/null
+++ b/tests/pass/issues/issue-miri-3282-struct-tail-normalize.rs
@@ -0,0 +1,20 @@
+// regression test for an ICE: https://github.com/rust-lang/miri/issues/3282
+
+trait Id {
+    type Assoc: ?Sized;
+}
+
+impl<T: ?Sized> Id for T {
+    type Assoc = T;
+}
+
+#[repr(transparent)]
+struct Foo<T: ?Sized> {
+    field: <T as Id>::Assoc,
+}
+
+fn main() {
+    let x = unsafe { std::mem::transmute::<fn(&str), fn(&Foo<str>)>(|_| ()) };
+    let foo: &Foo<str> = unsafe { &*("uwu" as *const str as *const Foo<str>) };
+    x(foo);
+}

From c38f3deba86858349682100efaa6a1cc6c35bf25 Mon Sep 17 00:00:00 2001
From: The Miri Conjob Bot <miri@cron.bot>
Date: Tue, 6 Feb 2024 05:10:11 +0000
Subject: [PATCH 3/3] Preparing for merge from rustc

---
 rust-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-version b/rust-version
index e36763cc7a..f3e10689ff 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-80deabd0987201e1b8d060400f50e03309a0105e
+f3b9d47a46c6d237665801155aa3e26c5f49958b