From e2c210e67f8b9bf8d0acd785aa7db65bbff28ffb Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 13 Oct 2024 12:24:54 +0200
Subject: [PATCH 1/3] sys/windows: remove miri hack that is only needed for
 win7

---
 std/src/sys/pal/windows/c.rs      | 2 +-
 std/src/sys/pal/windows/compat.rs | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/std/src/sys/pal/windows/c.rs b/std/src/sys/pal/windows/c.rs
index b65ad7dbe8c5a..9ce3e912caf1b 100644
--- a/std/src/sys/pal/windows/c.rs
+++ b/std/src/sys/pal/windows/c.rs
@@ -175,9 +175,9 @@ extern "system" {
     pub fn WakeByAddressAll(address: *const c_void);
 }
 
+// These are loaded by `load_synch_functions`.
 #[cfg(target_vendor = "win7")]
 compat_fn_optional! {
-    crate::sys::compat::load_synch_functions();
     pub fn WaitOnAddress(
         address: *const c_void,
         compareaddress: *const c_void,
diff --git a/std/src/sys/pal/windows/compat.rs b/std/src/sys/pal/windows/compat.rs
index c8e25dd0c94ba..42999da166451 100644
--- a/std/src/sys/pal/windows/compat.rs
+++ b/std/src/sys/pal/windows/compat.rs
@@ -198,11 +198,10 @@ macro_rules! compat_fn_with_fallback {
 
 /// Optionally loaded functions.
 ///
-/// Actual loading of the function defers to $load_functions.
+/// Relies on the functions being pre-loaded elsewhere.
 #[cfg(target_vendor = "win7")]
 macro_rules! compat_fn_optional {
-    ($load_functions:expr;
-    $(
+    ($(
         $(#[$meta:meta])*
         $vis:vis fn $symbol:ident($($argname:ident: $argtype:ty),*) $(-> $rettype:ty)?;
     )+) => (
@@ -221,9 +220,6 @@ macro_rules! compat_fn_optional {
 
                 #[inline(always)]
                 pub fn option() -> Option<F> {
-                    // Miri does not understand the way we do preloading
-                    // therefore load the function here instead.
-                    #[cfg(miri)] $load_functions;
                     NonNull::new(PTR.load(Ordering::Relaxed)).map(|f| unsafe { mem::transmute(f) })
                 }
             }

From e3f701c4b40829edc47dc2cb796b7723b8ceb35a Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 13 Oct 2024 12:27:09 +0200
Subject: [PATCH 2/3] remove outdated comment now that Miri is on CI

---
 std/src/sys/pal/windows/mod.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/std/src/sys/pal/windows/mod.rs b/std/src/sys/pal/windows/mod.rs
index 1ea253e5e5263..a9886012e8ee9 100644
--- a/std/src/sys/pal/windows/mod.rs
+++ b/std/src/sys/pal/windows/mod.rs
@@ -346,7 +346,6 @@ pub fn abort_internal() -> ! {
     }
 }
 
-// miri is sensitive to changes here so check that miri is happy if touching this
 #[cfg(miri)]
 pub fn abort_internal() -> ! {
     crate::intrinsics::abort();

From 4c6374963e616766b52b7cdc516395cff7971873 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 13 Oct 2024 12:34:28 +0200
Subject: [PATCH 3/3] sys/unix: add comments for some Miri fallbacks

---
 std/src/sys/pal/unix/fs.rs             | 2 +-
 std/src/sys/sync/thread_parking/mod.rs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/std/src/sys/pal/unix/fs.rs b/std/src/sys/pal/unix/fs.rs
index 39aabf0b2d679..e80299f1868cf 100644
--- a/std/src/sys/pal/unix/fs.rs
+++ b/std/src/sys/pal/unix/fs.rs
@@ -899,7 +899,7 @@ impl DirEntry {
             target_os = "android",
             target_os = "hurd"
         ),
-        not(miri)
+        not(miri) // no dirfd on Miri
     ))]
     pub fn metadata(&self) -> io::Result<FileAttr> {
         let fd = cvt(unsafe { dirfd(self.dir.dirp.0) })?;
diff --git a/std/src/sys/sync/thread_parking/mod.rs b/std/src/sys/sync/thread_parking/mod.rs
index 0ebc5e093ee2a..f4d8fa0a58c11 100644
--- a/std/src/sys/sync/thread_parking/mod.rs
+++ b/std/src/sys/sync/thread_parking/mod.rs
@@ -23,6 +23,7 @@ cfg_if::cfg_if! {
         mod windows7;
         pub use windows7::Parker;
     } else if #[cfg(all(target_vendor = "apple", not(miri)))] {
+        // Doesn't work in Miri, see <https://github.com/rust-lang/miri/issues/2589>.
         mod darwin;
         pub use darwin::Parker;
     } else if #[cfg(target_os = "xous")] {