mirror of https://github.com/rust-lang/rust.git
Auto merge of #84052 - RalfJung:libcore-miri, r=Mark-Simulacrum
fix Miri errors in libcore doctests Now that Miri can run doctests, it found some issues in the libcore doctests: * The `AtomicPtr` tests accessed dangling memory! `AtomicPtr::new(&mut 10);` makes the `10` a temporary that is deallocated after the end of this expression. * The tests for `set_ptr_value` used `&array[0] as *const _` to get a pointer to the array; this needs to be `array.as_ptr()` instead (Cc https://github.com/rust-lang/unsafe-code-guidelines/issues/134). * I reduced a buffer size in a `MaybeUninit` test to make it less slow in Miri, and added a spin loop hint to fix a diverging loop in Miri.
This commit is contained in:
commit
72c63de2cc
|
@ -736,22 +736,22 @@ impl<T> MaybeUninit<T> {
|
||||||
/// #![feature(maybe_uninit_ref)]
|
/// #![feature(maybe_uninit_ref)]
|
||||||
/// use std::mem::MaybeUninit;
|
/// use std::mem::MaybeUninit;
|
||||||
///
|
///
|
||||||
/// # unsafe extern "C" fn initialize_buffer(buf: *mut [u8; 2048]) { *buf = [0; 2048] }
|
/// # unsafe extern "C" fn initialize_buffer(buf: *mut [u8; 1024]) { *buf = [0; 1024] }
|
||||||
/// # #[cfg(FALSE)]
|
/// # #[cfg(FALSE)]
|
||||||
/// extern "C" {
|
/// extern "C" {
|
||||||
/// /// Initializes *all* the bytes of the input buffer.
|
/// /// Initializes *all* the bytes of the input buffer.
|
||||||
/// fn initialize_buffer(buf: *mut [u8; 2048]);
|
/// fn initialize_buffer(buf: *mut [u8; 1024]);
|
||||||
/// }
|
/// }
|
||||||
///
|
///
|
||||||
/// let mut buf = MaybeUninit::<[u8; 2048]>::uninit();
|
/// let mut buf = MaybeUninit::<[u8; 1024]>::uninit();
|
||||||
///
|
///
|
||||||
/// // Initialize `buf`:
|
/// // Initialize `buf`:
|
||||||
/// unsafe { initialize_buffer(buf.as_mut_ptr()); }
|
/// unsafe { initialize_buffer(buf.as_mut_ptr()); }
|
||||||
/// // Now we know that `buf` has been initialized, so we could `.assume_init()` it.
|
/// // Now we know that `buf` has been initialized, so we could `.assume_init()` it.
|
||||||
/// // However, using `.assume_init()` may trigger a `memcpy` of the 2048 bytes.
|
/// // However, using `.assume_init()` may trigger a `memcpy` of the 1024 bytes.
|
||||||
/// // To assert our buffer has been initialized without copying it, we upgrade
|
/// // To assert our buffer has been initialized without copying it, we upgrade
|
||||||
/// // the `&mut MaybeUninit<[u8; 2048]>` to a `&mut [u8; 2048]`:
|
/// // the `&mut MaybeUninit<[u8; 1024]>` to a `&mut [u8; 1024]`:
|
||||||
/// let buf: &mut [u8; 2048] = unsafe {
|
/// let buf: &mut [u8; 1024] = unsafe {
|
||||||
/// // SAFETY: `buf` has been initialized.
|
/// // SAFETY: `buf` has been initialized.
|
||||||
/// buf.assume_init_mut()
|
/// buf.assume_init_mut()
|
||||||
/// };
|
/// };
|
||||||
|
|
|
@ -724,7 +724,7 @@ impl<T: ?Sized> *const T {
|
||||||
/// #![feature(set_ptr_value)]
|
/// #![feature(set_ptr_value)]
|
||||||
/// # use core::fmt::Debug;
|
/// # use core::fmt::Debug;
|
||||||
/// let arr: [i32; 3] = [1, 2, 3];
|
/// let arr: [i32; 3] = [1, 2, 3];
|
||||||
/// let mut ptr = &arr[0] as *const dyn Debug;
|
/// let mut ptr = arr.as_ptr() as *const dyn Debug;
|
||||||
/// let thin = ptr as *const u8;
|
/// let thin = ptr as *const u8;
|
||||||
/// unsafe {
|
/// unsafe {
|
||||||
/// ptr = ptr.set_ptr_value(thin.add(8));
|
/// ptr = ptr.set_ptr_value(thin.add(8));
|
||||||
|
|
|
@ -830,7 +830,7 @@ impl<T: ?Sized> *mut T {
|
||||||
/// #![feature(set_ptr_value)]
|
/// #![feature(set_ptr_value)]
|
||||||
/// # use core::fmt::Debug;
|
/// # use core::fmt::Debug;
|
||||||
/// let mut arr: [i32; 3] = [1, 2, 3];
|
/// let mut arr: [i32; 3] = [1, 2, 3];
|
||||||
/// let mut ptr = &mut arr[0] as *mut dyn Debug;
|
/// let mut ptr = arr.as_mut_ptr() as *mut dyn Debug;
|
||||||
/// let thin = ptr as *mut u8;
|
/// let thin = ptr as *mut u8;
|
||||||
/// unsafe {
|
/// unsafe {
|
||||||
/// ptr = ptr.set_ptr_value(thin.add(8));
|
/// ptr = ptr.set_ptr_value(thin.add(8));
|
||||||
|
|
|
@ -78,7 +78,7 @@
|
||||||
//! ```
|
//! ```
|
||||||
//! use std::sync::Arc;
|
//! use std::sync::Arc;
|
||||||
//! use std::sync::atomic::{AtomicUsize, Ordering};
|
//! use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
//! use std::thread;
|
//! use std::{hint, thread};
|
||||||
//!
|
//!
|
||||||
//! fn main() {
|
//! fn main() {
|
||||||
//! let spinlock = Arc::new(AtomicUsize::new(1));
|
//! let spinlock = Arc::new(AtomicUsize::new(1));
|
||||||
|
@ -89,7 +89,9 @@
|
||||||
//! });
|
//! });
|
||||||
//!
|
//!
|
||||||
//! // Wait for the other thread to release the lock
|
//! // Wait for the other thread to release the lock
|
||||||
//! while spinlock.load(Ordering::SeqCst) != 0 {}
|
//! while spinlock.load(Ordering::SeqCst) != 0 {
|
||||||
|
//! hint::spin_loop();
|
||||||
|
//! }
|
||||||
//!
|
//!
|
||||||
//! if let Err(panic) = thread.join() {
|
//! if let Err(panic) = thread.join() {
|
||||||
//! println!("Thread had an error: {:?}", panic);
|
//! println!("Thread had an error: {:?}", panic);
|
||||||
|
@ -898,8 +900,10 @@ impl<T> AtomicPtr<T> {
|
||||||
/// ```
|
/// ```
|
||||||
/// use std::sync::atomic::{AtomicPtr, Ordering};
|
/// use std::sync::atomic::{AtomicPtr, Ordering};
|
||||||
///
|
///
|
||||||
/// let mut atomic_ptr = AtomicPtr::new(&mut 10);
|
/// let mut data = 10;
|
||||||
/// *atomic_ptr.get_mut() = &mut 5;
|
/// let mut atomic_ptr = AtomicPtr::new(&mut data);
|
||||||
|
/// let mut other_data = 5;
|
||||||
|
/// *atomic_ptr.get_mut() = &mut other_data;
|
||||||
/// assert_eq!(unsafe { *atomic_ptr.load(Ordering::SeqCst) }, 5);
|
/// assert_eq!(unsafe { *atomic_ptr.load(Ordering::SeqCst) }, 5);
|
||||||
/// ```
|
/// ```
|
||||||
#[inline]
|
#[inline]
|
||||||
|
@ -916,9 +920,11 @@ impl<T> AtomicPtr<T> {
|
||||||
/// #![feature(atomic_from_mut)]
|
/// #![feature(atomic_from_mut)]
|
||||||
/// use std::sync::atomic::{AtomicPtr, Ordering};
|
/// use std::sync::atomic::{AtomicPtr, Ordering};
|
||||||
///
|
///
|
||||||
/// let mut some_ptr = &mut 123 as *mut i32;
|
/// let mut data = 123;
|
||||||
|
/// let mut some_ptr = &mut data as *mut i32;
|
||||||
/// let a = AtomicPtr::from_mut(&mut some_ptr);
|
/// let a = AtomicPtr::from_mut(&mut some_ptr);
|
||||||
/// a.store(&mut 456, Ordering::Relaxed);
|
/// let mut other_data = 456;
|
||||||
|
/// a.store(&mut other_data, Ordering::Relaxed);
|
||||||
/// assert_eq!(unsafe { *some_ptr }, 456);
|
/// assert_eq!(unsafe { *some_ptr }, 456);
|
||||||
/// ```
|
/// ```
|
||||||
#[inline]
|
#[inline]
|
||||||
|
@ -944,7 +950,8 @@ impl<T> AtomicPtr<T> {
|
||||||
/// ```
|
/// ```
|
||||||
/// use std::sync::atomic::AtomicPtr;
|
/// use std::sync::atomic::AtomicPtr;
|
||||||
///
|
///
|
||||||
/// let atomic_ptr = AtomicPtr::new(&mut 5);
|
/// let mut data = 5;
|
||||||
|
/// let atomic_ptr = AtomicPtr::new(&mut data);
|
||||||
/// assert_eq!(unsafe { *atomic_ptr.into_inner() }, 5);
|
/// assert_eq!(unsafe { *atomic_ptr.into_inner() }, 5);
|
||||||
/// ```
|
/// ```
|
||||||
#[inline]
|
#[inline]
|
||||||
|
|
Loading…
Reference in New Issue