Skip to content

Commit

Permalink
chore: use relaxed load for unsync_load on miri (#6179)
Browse files Browse the repository at this point in the history
  • Loading branch information
Darksonn authored Dec 8, 2023
1 parent d561b58 commit 48c0e62
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
6 changes: 5 additions & 1 deletion tokio/src/loom/std/atomic_u16.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ impl AtomicU16 {
/// All mutations must have happened before the unsynchronized load.
/// Additionally, there must be no concurrent mutations.
pub(crate) unsafe fn unsync_load(&self) -> u16 {
core::ptr::read(self.inner.get() as *const 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);
}
}

Expand Down
6 changes: 5 additions & 1 deletion tokio/src/loom/std/atomic_u32.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ impl AtomicU32 {
/// All mutations must have happened before the unsynchronized load.
/// Additionally, there must be no concurrent mutations.
pub(crate) unsafe fn unsync_load(&self) -> u32 {
core::ptr::read(self.inner.get() as *const 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);
}
}

Expand Down
6 changes: 5 additions & 1 deletion tokio/src/loom/std/atomic_usize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ impl AtomicUsize {
/// All mutations must have happened before the unsynchronized load.
/// Additionally, there must be no concurrent mutations.
pub(crate) unsafe fn unsync_load(&self) -> usize {
core::ptr::read(self.inner.get() as *const 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);
}

pub(crate) fn with_mut<R>(&mut self, f: impl FnOnce(&mut usize) -> R) -> R {
Expand Down

0 comments on commit 48c0e62

Please sign in to comment.