Auto merge of rust-lang#2880 - RalfJung:sync, r=RalfJung

increase timing slack for sync tests; port tests to 2021 edition

Author: bors

src/tools/miri/tests/compiletest.rs

@@ -52,7 +52,7 @@ fn run_tests(mode: Mode, path: &str, target: &str, with_dependencies: bool) -> R
         mode,
         program: miri_path(),
         quiet: false,
-        edition: Some("2018".into()),
+        edition: Some("2021".into()),
         ..Config::default()
     };
 

src/tools/miri/tests/fail/concurrency/libc_pthread_create_too_few_args.stderr

@@ -7,8 +7,8 @@ LL |     panic!()
    = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
    = note: BACKTRACE:
-   = note: inside `thread_start` at RUSTLIB/std/src/panic.rs:LL:CC
-   = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: inside `thread_start` at RUSTLIB/core/src/panic.rs:LL:CC
+   = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 

src/tools/miri/tests/fail/concurrency/libc_pthread_create_too_many_args.stderr

@@ -7,8 +7,8 @@ LL |     panic!()
    = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
    = note: BACKTRACE:
-   = note: inside `thread_start` at RUSTLIB/std/src/panic.rs:LL:CC
-   = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: inside `thread_start` at RUSTLIB/core/src/panic.rs:LL:CC
+   = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 

src/tools/miri/tests/fail/data_race/alloc_read_race.rs

@@ -26,6 +26,7 @@ pub fn main() {
     //  2. write
     unsafe {
         let j1 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             // Concurrent allocate the memory.
             // Uses relaxed semantics to not generate
             // a release sequence.
@@ -34,6 +35,7 @@ pub fn main() {
         });
 
         let j2 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             let pointer = &*ptr.0;
 
             // Note: could also error due to reading uninitialized memory, but the data-race detector triggers first.

src/tools/miri/tests/fail/data_race/alloc_write_race.rs

@@ -25,6 +25,7 @@ pub fn main() {
     //  2. write
     unsafe {
         let j1 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             // Concurrent allocate the memory.
             // Uses relaxed semantics to not generate
             // a release sequence.
@@ -34,6 +35,7 @@ pub fn main() {
         });
 
         let j2 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             let pointer = &*ptr.0;
             *pointer.load(Ordering::Relaxed) = 2; //~ ERROR: Data race detected between (1) Allocate on thread `<unnamed>` and (2) Write on thread `<unnamed>`
         });

src/tools/miri/tests/fail/data_race/atomic_read_na_write_race1.rs

@@ -16,10 +16,12 @@ pub fn main() {
     let c = EvilSend(b);
     unsafe {
         let j1 = spawn(move || {
+            let c = c; // avoid field capturing
             *(c.0 as *mut usize) = 32;
         });
 
         let j2 = spawn(move || {
+            let c = c; // avoid field capturing
             (&*c.0).load(Ordering::SeqCst) //~ ERROR: Data race detected between (1) Write on thread `<unnamed>` and (2) Atomic Load on thread `<unnamed>`
         });
 

src/tools/miri/tests/fail/data_race/atomic_read_na_write_race2.rs

@@ -17,11 +17,13 @@ pub fn main() {
     let c = EvilSend(b);
     unsafe {
         let j1 = spawn(move || {
+            let c = c; // avoid field capturing
             let atomic_ref = &mut *c.0;
             atomic_ref.load(Ordering::SeqCst)
         });
 
         let j2 = spawn(move || {
+            let c = c; // avoid field capturing
             let atomic_ref = &mut *c.0;
             *atomic_ref.get_mut() = 32; //~ ERROR: Data race detected between (1) Atomic Load on thread `<unnamed>` and (2) Write on thread `<unnamed>`
         });

src/tools/miri/tests/fail/data_race/atomic_write_na_read_race1.rs

@@ -17,11 +17,13 @@ pub fn main() {
     let c = EvilSend(b);
     unsafe {
         let j1 = spawn(move || {
+            let c = c; // avoid field capturing
             let atomic_ref = &mut *c.0;
             atomic_ref.store(32, Ordering::SeqCst)
         });
 
         let j2 = spawn(move || {
+            let c = c; // avoid field capturing
             let atomic_ref = &mut *c.0;
             *atomic_ref.get_mut() //~ ERROR: Data race detected between (1) Atomic Store on thread `<unnamed>` and (2) Read on thread `<unnamed>`
         });

src/tools/miri/tests/fail/data_race/atomic_write_na_read_race2.rs

@@ -16,10 +16,12 @@ pub fn main() {
     let c = EvilSend(b);
     unsafe {
         let j1 = spawn(move || {
+            let c = c; // avoid field capturing
             let _val = *(c.0 as *mut usize);
         });
 
         let j2 = spawn(move || {
+            let c = c; // avoid field capturing
             (&*c.0).store(32, Ordering::SeqCst); //~ ERROR: Data race detected between (1) Read on thread `<unnamed>` and (2) Atomic Store on thread `<unnamed>`
         });
 

src/tools/miri/tests/fail/data_race/atomic_write_na_write_race1.rs

@@ -16,10 +16,12 @@ pub fn main() {
     let c = EvilSend(b);
     unsafe {
         let j1 = spawn(move || {
+            let c = c; // avoid field capturing
             *(c.0 as *mut usize) = 32;
         });
 
         let j2 = spawn(move || {
+            let c = c; // avoid field capturing
             (&*c.0).store(64, Ordering::SeqCst); //~ ERROR: Data race detected between (1) Write on thread `<unnamed>` and (2) Atomic Store on thread `<unnamed>`
         });
 

src/tools/miri/tests/fail/data_race/atomic_write_na_write_race2.rs

@@ -17,11 +17,13 @@ pub fn main() {
     let c = EvilSend(b);
     unsafe {
         let j1 = spawn(move || {
+            let c = c; // avoid field capturing
             let atomic_ref = &mut *c.0;
             atomic_ref.store(64, Ordering::SeqCst);
         });
 
         let j2 = spawn(move || {
+            let c = c; // avoid field capturing
             let atomic_ref = &mut *c.0;
             *atomic_ref.get_mut() = 32; //~ ERROR: Data race detected between (1) Atomic Store on thread `<unnamed>` and (2) Write on thread `<unnamed>`
         });

src/tools/miri/tests/fail/data_race/dangling_thread_async_race.rs

@@ -18,6 +18,7 @@ fn main() {
 
     let join = unsafe {
         spawn(move || {
+            let c = c; // capture `c`, not just its field.
             *c.0 = 32;
         })
     };
@@ -34,6 +35,7 @@ fn main() {
 
     let join2 = unsafe {
         spawn(move || {
+            let c = c; // capture `c`, not just its field.
             *c.0 = 64; //~ ERROR: Data race detected between (1) Write on thread `<unnamed>` and (2) Write on thread `<unnamed>`
         })
     };

src/tools/miri/tests/fail/data_race/dangling_thread_race.rs

@@ -18,6 +18,7 @@ fn main() {
 
     let join = unsafe {
         spawn(move || {
+            let c = c; // avoid field capturing
             *c.0 = 32;
         })
     };

src/tools/miri/tests/fail/data_race/dealloc_read_race1.rs

@@ -20,10 +20,12 @@ pub fn main() {
 
     unsafe {
         let j1 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             let _val = *ptr.0;
         });
 
         let j2 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             __rust_dealloc(
                 //~^ ERROR: Data race detected between (1) Read on thread `<unnamed>` and (2) Deallocate on thread `<unnamed>`
                 ptr.0 as *mut _,

src/tools/miri/tests/fail/data_race/dealloc_read_race2.rs

@@ -20,6 +20,7 @@ pub fn main() {
 
     unsafe {
         let j1 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             __rust_dealloc(
                 ptr.0 as *mut _,
                 std::mem::size_of::<usize>(),
@@ -28,6 +29,7 @@ pub fn main() {
         });
 
         let j2 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             // Also an error of the form: Data race detected between (1) Deallocate on thread `<unnamed>` and (2) Read on thread `<unnamed>`
             // but the invalid allocation is detected first.
             *ptr.0 //~ ERROR: dereferenced after this allocation got freed

src/tools/miri/tests/fail/data_race/dealloc_read_race_stack.rs

@@ -26,6 +26,7 @@ pub fn main() {
     //  3. stack-deallocate
     unsafe {
         let j1 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             let pointer = &*ptr.0;
             {
                 let mut stack_var = 0usize;
@@ -39,6 +40,7 @@ pub fn main() {
         });
 
         let j2 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             let pointer = &*ptr.0;
             *pointer.load(Ordering::Acquire)
         });

src/tools/miri/tests/fail/data_race/dealloc_write_race1.rs

@@ -19,10 +19,12 @@ pub fn main() {
 
     unsafe {
         let j1 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             *ptr.0 = 2;
         });
 
         let j2 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             __rust_dealloc(
                 //~^ ERROR: Data race detected between (1) Write on thread `<unnamed>` and (2) Deallocate on thread `<unnamed>`
                 ptr.0 as *mut _,

src/tools/miri/tests/fail/data_race/dealloc_write_race2.rs

@@ -19,6 +19,7 @@ pub fn main() {
 
     unsafe {
         let j1 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             __rust_dealloc(
                 ptr.0 as *mut _,
                 std::mem::size_of::<usize>(),
@@ -27,6 +28,7 @@ pub fn main() {
         });
 
         let j2 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             // Also an error of the form: Data race detected between (1) Deallocate on thread `<unnamed>` and (2) Write on thread `<unnamed>`
             // but the invalid allocation is detected first.
             *ptr.0 = 2; //~ ERROR: dereferenced after this allocation got freed

src/tools/miri/tests/fail/data_race/dealloc_write_race_stack.rs

@@ -26,6 +26,7 @@ pub fn main() {
     //  3. stack-deallocate
     unsafe {
         let j1 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             let pointer = &*ptr.0;
             {
                 let mut stack_var = 0usize;
@@ -39,6 +40,7 @@ pub fn main() {
         });
 
         let j2 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             let pointer = &*ptr.0;
             *pointer.load(Ordering::Acquire) = 3;
         });

src/tools/miri/tests/fail/data_race/enable_after_join_to_main.rs

@@ -26,10 +26,12 @@ pub fn main() {
     let c = EvilSend(b);
     unsafe {
         let j1 = spawn(move || {
+            let c = c; // avoid field capturing
             *c.0 = 32;
         });
 
         let j2 = spawn(move || {
+            let c = c; // avoid field capturing
             *c.0 = 64; //~ ERROR: Data race detected between (1) Write on thread `<unnamed>` and (2) Write on thread `<unnamed>`
         });
 

src/tools/miri/tests/fail/data_race/read_write_race.rs

@@ -15,10 +15,12 @@ pub fn main() {
     let c = EvilSend(b);
     unsafe {
         let j1 = spawn(move || {
+            let c = c; // avoid field capturing
             let _val = *c.0;
         });
 
         let j2 = spawn(move || {
+            let c = c; // avoid field capturing
             *c.0 = 64; //~ ERROR: Data race detected between (1) Read on thread `<unnamed>` and (2) Write on thread `<unnamed>`
         });
 

src/tools/miri/tests/fail/data_race/read_write_race_stack.rs

@@ -31,6 +31,7 @@ pub fn main() {
     //  5. read-value
     unsafe {
         let j1 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             // Concurrent allocate the memory.
             // Uses relaxed semantics to not generate
             // a release sequence.
@@ -46,6 +47,7 @@ pub fn main() {
         });
 
         let j2 = spawn(move || {
+            let ptr = ptr; // avoid field capturing
             let pointer = &*ptr.0;
             *pointer.load(Ordering::Acquire) = 3;
         });

src/tools/miri/tests/fail/data_race/relax_acquire_race.rs

@@ -25,6 +25,7 @@ pub fn main() {
     //  4. load acquire : 2
     unsafe {
         let j1 = spawn(move || {
+            let c = c; // avoid field capturing
             *c.0 = 1;
             SYNC.store(1, Ordering::Release);
         });
@@ -36,6 +37,7 @@ pub fn main() {
         });
 
         let j3 = spawn(move || {
+            let c = c; // avoid field capturing
             if SYNC.load(Ordering::Acquire) == 2 {
                 *c.0 //~ ERROR: Data race detected between (1) Write on thread `<unnamed>` and (2) Read on thread `<unnamed>`
             } else {

src/tools/miri/tests/fail/data_race/release_seq_race.rs

@@ -27,6 +27,7 @@ pub fn main() {
     //  4. load acquire : 3
     unsafe {
         let j1 = spawn(move || {
+            let c = c; // avoid field capturing
             *c.0 = 1;
             SYNC.store(1, Ordering::Release);
             sleep(Duration::from_millis(200));
@@ -39,6 +40,7 @@ pub fn main() {
         });
 
         let j3 = spawn(move || {
+            let c = c; // avoid field capturing
             sleep(Duration::from_millis(500));
             if SYNC.load(Ordering::Acquire) == 3 {
                 *c.0 //~ ERROR: Data race detected between (1) Write on thread `<unnamed>` and (2) Read on thread `<unnamed>`

src/tools/miri/tests/fail/data_race/release_seq_race_same_thread.rs

@@ -25,6 +25,7 @@ pub fn main() {
     //  3. load acquire : 2
     unsafe {
         let j1 = spawn(move || {
+            let c = c; // avoid field capturing
             *c.0 = 1;
             SYNC.store(1, Ordering::Release);
 
@@ -36,6 +37,7 @@ pub fn main() {
         });
 
         let j2 = spawn(move || {
+            let c = c; // avoid field capturing
             if SYNC.load(Ordering::Acquire) == 2 {
                 *c.0 //~ ERROR: Data race detected between (1) Write on thread `<unnamed>` and (2) Read on thread `<unnamed>`
             } else {

src/tools/miri/tests/fail/data_race/rmw_race.rs

@@ -25,6 +25,7 @@ pub fn main() {
     //  4. load acquire : 3
     unsafe {
         let j1 = spawn(move || {
+            let c = c; // capture `c`, not just its field.
             *c.0 = 1;
             SYNC.store(1, Ordering::Release);
         });
@@ -37,6 +38,7 @@ pub fn main() {
         });
 
         let j3 = spawn(move || {
+            let c = c; // capture `c`, not just its field.
             if SYNC.load(Ordering::Acquire) == 3 {
                 *c.0 //~ ERROR: Data race detected between (1) Write on thread `<unnamed>` and (2) Read on thread `<unnamed>`
             } else {

src/tools/miri/tests/fail/data_race/stack_pop_race.rs

@@ -13,7 +13,7 @@ fn main() {
 fn race(local: i32) {
     let ptr = MakeSend(&local as *const i32);
     thread::spawn(move || {
-        let ptr = ptr;
+        let ptr = ptr; // avoid field capturing
         let _val = unsafe { *ptr.0 };
     });
     // Make the other thread go first so that it does not UAF.

src/tools/miri/tests/fail/data_race/write_write_race.rs

@@ -15,10 +15,12 @@ pub fn main() {
     let c = EvilSend(b);
     unsafe {
         let j1 = spawn(move || {
+            let c = c; // avoid field capturing
             *c.0 = 32;
         });
 
         let j2 = spawn(move || {
+            let c = c; // avoid field capturing
             *c.0 = 64; //~ ERROR: Data race detected between (1) Write on thread `<unnamed>` and (2) Write on thread `<unnamed>`
         });