Skip to content

Commit 6428be1

Browse files
authored
Merge pull request #4953 from RalfJung/hack-no-more
genmc tests: remove a hack that is no longer needed
2 parents 5474218 + a75e80c commit 6428be1

2 files changed

Lines changed: 0 additions & 11 deletions

File tree

src/tools/miri/tests/fail/weak_memory/weak_uninit.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@
1010
use std::sync::atomic::*;
1111
use std::thread::spawn;
1212

13-
#[allow(dead_code)]
14-
#[derive(Copy, Clone)]
15-
struct EvilSend<T>(pub T);
16-
17-
unsafe impl<T> Send for EvilSend<T> {}
18-
unsafe impl<T> Sync for EvilSend<T> {}
19-
2013
// We can't create static items because we need to run each test multiple times.
2114
fn static_uninit_atomic() -> &'static AtomicUsize {
2215
unsafe { Box::leak(Box::new_uninit()).assume_init_ref() }

src/tools/miri/tests/genmc/fail/loom/store_buffering.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ fn miri_start(_argc: isize, _argv: *const *const u8) -> isize {
2929
let x = AtomicUsize::new(0);
3030
let y = AtomicUsize::new(0);
3131

32-
// FIXME(genmc,HACK): remove these initializing writes once Miri-GenMC supports mixed atomic-non-atomic accesses.
33-
x.store(0, Relaxed);
34-
y.store(0, Relaxed);
35-
3632
let mut a: usize = 1234;
3733
let mut b: usize = 1234;
3834
unsafe {

0 commit comments

Comments
 (0)