Skip to content

Commit 02ded33

Browse files
committed
Auto merge of rust-lang#2766 - RalfJung:scfix, r=RalfJung
remove scfix test It was broken, and the fixed version actually fails... Thanks `@cbeuw` !
2 parents 3ed2c0a + 523325a commit 02ded33

File tree

1 file changed

+0
-35
lines changed

1 file changed

+0
-35
lines changed

src/tools/miri/tests/pass/0weak_memory_consistency.rs

-35
Original file line numberDiff line numberDiff line change
@@ -286,40 +286,6 @@ fn test_iriw_sc_rlx() {
286286
assert!(c || d);
287287
}
288288

289-
// Another test for C++20 SCfix.
290-
fn scfix() {
291-
let x = static_atomic_bool(false);
292-
let y = static_atomic_bool(false);
293-
294-
let thread1 = spawn(move || {
295-
let a = x.load(Relaxed);
296-
fence(SeqCst);
297-
let b = y.load(Relaxed);
298-
(a, b)
299-
});
300-
301-
let thread2 = spawn(move || {
302-
x.store(true, Relaxed);
303-
});
304-
let thread3 = spawn(move || {
305-
x.store(true, Relaxed);
306-
});
307-
308-
let thread4 = spawn(move || {
309-
let c = y.load(Relaxed);
310-
fence(SeqCst);
311-
let d = x.load(Relaxed);
312-
(c, d)
313-
});
314-
315-
let (a, b) = thread1.join().unwrap();
316-
thread2.join().unwrap();
317-
thread3.join().unwrap();
318-
let (c, d) = thread4.join().unwrap();
319-
let bad = a == true && b == false && c == true && d == false;
320-
assert!(!bad);
321-
}
322-
323289
pub fn main() {
324290
for _ in 0..50 {
325291
test_single_thread();
@@ -331,6 +297,5 @@ pub fn main() {
331297
test_sc_store_buffering();
332298
test_sync_through_rmw_and_fences();
333299
test_iriw_sc_rlx();
334-
scfix();
335300
}
336301
}

0 commit comments

Comments
 (0)