Skip to content

Commit 939b143

Browse files
committed
Auto merge of #82704 - RalfJung:miri-atomic-minmax, r=oli-obk
enable atomic_min/max tests in Miri Thanks to `@henryboisdequin` and `@GregBowyer,` Miri now supports these intrinsics. :) Also includes the necessary Miri update.
2 parents 770ed1c + be958e1 commit 939b143

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

library/core/tests/atomic.rs

-4
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ fn uint_xor() {
6161

6262
#[test]
6363
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
64-
#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_min
6564
fn uint_min() {
6665
let x = AtomicUsize::new(0xf731);
6766
assert_eq!(x.fetch_min(0x137f, SeqCst), 0xf731);
@@ -72,7 +71,6 @@ fn uint_min() {
7271

7372
#[test]
7473
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
75-
#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_max
7674
fn uint_max() {
7775
let x = AtomicUsize::new(0x137f);
7876
assert_eq!(x.fetch_max(0xf731, SeqCst), 0x137f);
@@ -111,7 +109,6 @@ fn int_xor() {
111109

112110
#[test]
113111
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
114-
#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_min
115112
fn int_min() {
116113
let x = AtomicIsize::new(0xf731);
117114
assert_eq!(x.fetch_min(0x137f, SeqCst), 0xf731);
@@ -122,7 +119,6 @@ fn int_min() {
122119

123120
#[test]
124121
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
125-
#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_max
126122
fn int_max() {
127123
let x = AtomicIsize::new(0x137f);
128124
assert_eq!(x.fetch_max(0xf731, SeqCst), 0x137f);

0 commit comments

Comments
 (0)