chore: use relaxed load for unsync_load (tokio-rs#6203)

Totodore · Dec 8, 2023 · 1968565 · 1968565
1 parent c9273f1
commit 1968565
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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 {