From 1968565825b8a991af0e4ed9d61b56ce68ddd501 Mon Sep 17 00:00:00 2001
From: Alice Ryhl <aliceryhl@google.com>
Date: Fri, 8 Dec 2023 23:28:40 +0100
Subject: [PATCH] chore: use relaxed load for unsync_load (#6203)

---
 tokio/src/loom/std/atomic_u16.rs   | 5 +----
 tokio/src/loom/std/atomic_u32.rs   | 5 +----
 tokio/src/loom/std/atomic_usize.rs | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/tokio/src/loom/std/atomic_u16.rs b/tokio/src/loom/std/atomic_u16.rs
index f352e4fae5b..dfc31f642a6 100644
--- a/tokio/src/loom/std/atomic_u16.rs
+++ b/tokio/src/loom/std/atomic_u16.rs
@@ -24,10 +24,7 @@ impl AtomicU16 {
     /// Additionally, there must be no concurrent mutations.
     pub(crate) unsafe fn unsync_load(&self) -> u16 {
         // See <https://github.com/tokio-rs/tokio/issues/6155>
-        #[cfg(miri)]
-        return self.load(std::sync::atomic::Ordering::Relaxed);
-        #[cfg(not(miri))]
-        return core::ptr::read(self.inner.get() as *const u16);
+        self.load(std::sync::atomic::Ordering::Relaxed)
     }
 }
 
diff --git a/tokio/src/loom/std/atomic_u32.rs b/tokio/src/loom/std/atomic_u32.rs
index 422dc789037..94400176911 100644
--- a/tokio/src/loom/std/atomic_u32.rs
+++ b/tokio/src/loom/std/atomic_u32.rs
@@ -24,10 +24,7 @@ impl AtomicU32 {
     /// Additionally, there must be no concurrent mutations.
     pub(crate) unsafe fn unsync_load(&self) -> u32 {
         // See <https://github.com/tokio-rs/tokio/issues/6155>
-        #[cfg(miri)]
-        return self.load(std::sync::atomic::Ordering::Relaxed);
-        #[cfg(not(miri))]
-        return core::ptr::read(self.inner.get() as *const u32);
+        self.load(std::sync::atomic::Ordering::Relaxed)
     }
 }
 
diff --git a/tokio/src/loom/std/atomic_usize.rs b/tokio/src/loom/std/atomic_usize.rs
index 03f2b566550..64605c76dd0 100644
--- a/tokio/src/loom/std/atomic_usize.rs
+++ b/tokio/src/loom/std/atomic_usize.rs
@@ -24,10 +24,7 @@ impl AtomicUsize {
     /// Additionally, there must be no concurrent mutations.
     pub(crate) unsafe fn unsync_load(&self) -> usize {
         // See <https://github.com/tokio-rs/tokio/issues/6155>
-        #[cfg(miri)]
-        return self.load(std::sync::atomic::Ordering::Relaxed);
-        #[cfg(not(miri))]
-        return core::ptr::read(self.inner.get() as *const usize);
+        self.load(std::sync::atomic::Ordering::Relaxed)
     }
 
     pub(crate) fn with_mut<R>(&mut self, f: impl FnOnce(&mut usize) -> R) -> R {