From dc685f6815073d2ec45b7a507e717c91525563e4 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Tue, 2 Mar 2021 19:58:55 +0100 Subject: [PATCH 1/2] enable atomic_min/max tests in Miri --- library/core/tests/atomic.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/library/core/tests/atomic.rs b/library/core/tests/atomic.rs index 539982eb0e49f..b735957666fc5 100644 --- a/library/core/tests/atomic.rs +++ b/library/core/tests/atomic.rs @@ -61,7 +61,6 @@ fn uint_xor() { #[test] #[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins -#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_min fn uint_min() { let x = AtomicUsize::new(0xf731); assert_eq!(x.fetch_min(0x137f, SeqCst), 0xf731); @@ -72,7 +71,6 @@ fn uint_min() { #[test] #[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins -#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_max fn uint_max() { let x = AtomicUsize::new(0x137f); assert_eq!(x.fetch_max(0xf731, SeqCst), 0x137f); @@ -111,7 +109,6 @@ fn int_xor() { #[test] #[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins -#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_min fn int_min() { let x = AtomicIsize::new(0xf731); assert_eq!(x.fetch_min(0x137f, SeqCst), 0xf731); @@ -122,7 +119,6 @@ fn int_min() { #[test] #[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins -#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_max fn int_max() { let x = AtomicIsize::new(0x137f); assert_eq!(x.fetch_max(0xf731, SeqCst), 0x137f); From be958e1c4e13195f232ad7daac952dd844cabeb3 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Tue, 2 Mar 2021 20:01:25 +0100 Subject: [PATCH 2/2] update Miri --- src/tools/miri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/miri b/src/tools/miri index 39ebb079a8e1b..2670839e1af54 160000 --- a/src/tools/miri +++ b/src/tools/miri @@ -1 +1 @@ -Subproject commit 39ebb079a8e1bd9b8838b97bdc1718f4c0be6b48 +Subproject commit 2670839e1af540a496a0d889fce9ad42529ecc11