Auto merge of #1729 - RalfJung:rustup, r=RalfJung

rustup; fix tests for new MIR optimization

Somehow rust-lang/rust#78360 manages to mask UB. This would make sense if there were loops or things like that, but there are not, so really this is just very confusing...

Author: bors

ci.sh

@@ -24,8 +24,9 @@ function run_tests {
 
   ./miri test --locked
   if [ -z "${MIRI_TEST_TARGET+exists}" ]; then
-    # Only for host architecture: tests with MIR optimizations
-    MIRIFLAGS="-Z mir-opt-level=3" ./miri test --locked
+    # Only for host architecture: tests with optimizations (`-O` is what cargo passes, but crank MIR
+    # optimizations up all the way).
+    MIRIFLAGS="-O -Zmir-opt-level=3" ./miri test --locked
   fi
 
   # On Windows, there is always "python", not "python3" or "python2".

rust-version

@@ -1 +1 @@
-d2731d8e9338d8fe844e19d3fbb39617753e65f4
+09db05762b283bed62d4f92729cfee4646519833

tests/compile-fail/data_race/dealloc_read_race_stack.rs

@@ -27,9 +27,6 @@ pub fn main() {
     //  3. stack-deallocate
     unsafe {
         let j1 = spawn(move || {
-            // Concurrent allocate the memory.
-            // Uses relaxed semantics to not generate
-            // a release sequence.
             let pointer = &*ptr.0;
             {
                 let mut stack_var = 0usize;
@@ -38,6 +35,8 @@ pub fn main() {
 
                 sleep(Duration::from_millis(200));
 
+                // Now `stack_var` gets deallocated.
+
             } //~ ERROR Data race detected between Deallocate on Thread(id = 1) and Read on Thread(id = 2)
         });
 

tests/compile-fail/data_race/dealloc_read_race_stack_drop.rs

@@ -27,9 +27,6 @@ pub fn main() {
     //  3. stack-deallocate
     unsafe {
         let j1 = spawn(move || {
-            // Concurrent allocate the memory.
-            // Uses relaxed semantics to not generate
-            // a release sequence.
             let pointer = &*ptr.0;
             {
                 let mut stack_var = 0usize;
@@ -38,6 +35,8 @@ pub fn main() {
 
                 sleep(Duration::from_millis(200));
 
+                // Now `stack_var` gets deallocated.
+
             } //~ ERROR Data race detected between Deallocate on Thread(id = 1) and Write on Thread(id = 2)
         });
 

tests/compile-fail/data_race/dealloc_write_race_stack.rs

@@ -1,4 +1,5 @@
 // ignore-windows: No libc on Windows
+// error-pattern: deadlock
 
 #![feature(rustc_private)]
 
@@ -8,6 +9,6 @@ fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);
     unsafe {
         assert_eq!(libc::pthread_rwlock_rdlock(rw.get()), 0);
-        libc::pthread_rwlock_wrlock(rw.get()); //~ ERROR: deadlock
+        libc::pthread_rwlock_wrlock(rw.get());
     }
 }

tests/compile-fail/data_race/dealloc_write_race_stack_drop.rs

@@ -1,4 +1,5 @@
 // ignore-windows: No libc on Windows
+// error-pattern: deadlock
 
 #![feature(rustc_private)]
 
@@ -8,6 +9,6 @@ fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);
     unsafe {
         assert_eq!(libc::pthread_rwlock_wrlock(rw.get()), 0);
-        libc::pthread_rwlock_rdlock(rw.get()); //~ ERROR: deadlock
+        libc::pthread_rwlock_rdlock(rw.get());
     }
 }

…bc_pthread_rwlock_read_write_deadlock.rs …ock_read_write_deadlock_single_thread.rstests/compile-fail/sync/libc_pthread_rwlock_read_write_deadlock.rs renamed to tests/compile-fail/sync/libc_pthread_rwlock_read_write_deadlock_single_thread.rs tests/compile-fail/sync/libc_pthread_rwlock_read_write_deadlock.rs renamed to tests/compile-fail/sync/libc_pthread_rwlock_read_write_deadlock_single_thread.rs

@@ -1,4 +1,5 @@
 // ignore-windows: No libc on Windows
+// error-pattern: deadlock
 
 #![feature(rustc_private)]
 
@@ -8,6 +9,6 @@ fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);
     unsafe {
         assert_eq!(libc::pthread_rwlock_wrlock(rw.get()), 0);
-        libc::pthread_rwlock_wrlock(rw.get()); //~ ERROR: deadlock
+        libc::pthread_rwlock_wrlock(rw.get());
     }
 }