Skip to content

Commit 80d5991

Browse files
authored
Rollup merge of rust-lang#140660 - RalfJung:more-order, r=WaffleLapkin
remove 'unordered' atomic intrinsics As their doc comment already indicates, these operations do not currently have a place in our memory model. The intrinsics were introduced to support a hack in compiler-builtins, but that hack recently got removed (see rust-lang/compiler-builtins#788).
2 parents e528ad0 + 03b2493 commit 80d5991

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

core/src/intrinsics/mod.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -430,12 +430,6 @@ pub unsafe fn atomic_load_acquire<T: Copy>(src: *const T) -> T;
430430
#[rustc_intrinsic]
431431
#[rustc_nounwind]
432432
pub unsafe fn atomic_load_relaxed<T: Copy>(src: *const T) -> T;
433-
/// Do NOT use this intrinsic; "unordered" operations do not exist in our memory model!
434-
/// In terms of the Rust Abstract Machine, this operation is equivalent to `src.read()`,
435-
/// i.e., it performs a non-atomic read.
436-
#[rustc_intrinsic]
437-
#[rustc_nounwind]
438-
pub unsafe fn atomic_load_unordered<T: Copy>(src: *const T) -> T;
439433

440434
/// Stores the value at the specified memory location.
441435
/// `T` must be an integer or pointer type.
@@ -464,12 +458,6 @@ pub unsafe fn atomic_store_release<T: Copy>(dst: *mut T, val: T);
464458
#[rustc_intrinsic]
465459
#[rustc_nounwind]
466460
pub unsafe fn atomic_store_relaxed<T: Copy>(dst: *mut T, val: T);
467-
/// Do NOT use this intrinsic; "unordered" operations do not exist in our memory model!
468-
/// In terms of the Rust Abstract Machine, this operation is equivalent to `dst.write(val)`,
469-
/// i.e., it performs a non-atomic write.
470-
#[rustc_intrinsic]
471-
#[rustc_nounwind]
472-
pub unsafe fn atomic_store_unordered<T: Copy>(dst: *mut T, val: T);
473461

474462
/// Stores the value at the specified memory location, returning the old value.
475463
/// `T` must be an integer or pointer type.

0 commit comments

Comments
 (0)