Add thread-spawn run-pass test

Author: landaire

src/helpers.rs

@@ -628,22 +628,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         }
         Ok(())
     }
-
-    /// Handler that should be called when unsupported functionality is encountered.
-    /// This function will either panic within the context of the emulated application
-    /// or return an error in the Miri process context
-    ///
-    /// Return value of `Ok(bool)` indicates whether execution should continue.
-    fn handle_unsupported<S: AsRef<str>>(&mut self, error_msg: S) -> InterpResult<'tcx, ()> {
-        if self.eval_context_ref().machine.panic_on_unsupported {
-            // message is slightly different here to make automated analysis easier
-            let error_msg = format!("unsupported Miri functionality: {}", error_msg.as_ref());
-            self.start_panic(error_msg.as_ref(), StackPopUnwind::Skip)?;
-            return Ok(());
-        } else {
-            throw_unsup_format!("{}", error_msg);
-        }
-    }
 }
 
 /// Check that the number of args is what we expect.

src/shims/panic.rs

@@ -160,21 +160,20 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             Ok(StackPopJump::Normal)
         }
     }
-
+    
     /// Handler that should be called when unsupported functionality is encountered.
     /// This function will either panic within the context of the emulated application
     /// or return an error in the Miri process context
     ///
     /// Return value of `Ok(bool)` indicates whether execution should continue.
     fn handle_unsupported<S: AsRef<str>>(&mut self, error_msg: S) -> InterpResult<'tcx, ()> {
-        let error = format!("unsupported Miri functionality: {}", error_msg.as_ref());
-
         if self.eval_context_ref().machine.panic_on_unsupported {
             // message is slightly different here to make automated analysis easier
-            self.start_panic(error.as_ref(), StackPopUnwind::Skip)?;
+            let error_msg = format!("unsupported Miri functionality: {}", error_msg.as_ref());
+            self.start_panic(error_msg.as_ref(), StackPopUnwind::Skip)?;
             return Ok(());
         } else {
-            throw_unsup_format!("{}", error);
+            throw_unsup_format!("{}", error_msg.as_ref());
         }
     }
 

src/shims/posix/linux/foreign_items.rs

@@ -185,7 +185,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                     }
                     id => {
                         this.handle_unsupported(format!("can't execute syscall with ID {}", id))?;
-                        return Ok(false);
+                        return Ok(EmulateByNameResult::NotSupported);
                     }
                 }
             }

src/shims/windows/foreign_items.rs

@@ -344,8 +344,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             "CreateThread" => {
                 this.check_abi(abi, Abi::System { unwind: false })?;
 
-                this.handle_unsupported("concurrency is not supported on Windows")?;
-                return Ok(false);
+                this.handle_unsupported("Miri does not support concurrency on Windows")?;
+                return Ok(EmulateByNameResult::AlreadyJumped);
             }
 
             // Incomplete shims that we "stub out" just to get pre-main initialization code to work.

tests/compile-fail/unsupported_foreign_function.rs

@@ -4,6 +4,6 @@ fn main() {
     }
 
     unsafe {
-        foo(); //~ ERROR unsupported operation: can't call foreign function "foo"
+        foo(); //~ ERROR unsupported operation: can't call foreign function: foo
     }
 }

tests/run-pass/concurrency/thread-spawn.rs

@@ -0,0 +1,9 @@
+// compile-flags: -Zmiri-panic-on-unsupported -Zmiri-ignore-leaks
+// ignore-linux: Only Windows is not supported.
+// ignore-macos: Only Windows is not supported.
+
+use std::thread;
+
+fn main() {
+    thread::spawn(|| {});
+}

tests/run-pass/concurrency/thread-spawn.stderr

@@ -0,0 +1,2 @@
+thread 'main' panicked at 'unsupported Miri functionality: Miri does not support concurrency on Windows', RUSTLIB/std/src/sys/windows/thread.rs:LL:COL
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/run-pass/panic/unsupported_foreign_function.rs renamed to tests/run-pass/unsupported_foreign_function.rs

@@ -1,2 +1,2 @@
-thread 'main' panicked at 'unsupported Miri functionality: can't call foreign function "foo"', $DIR/unsupported_foreign_function.rs:9:9
+thread 'main' panicked at 'unsupported Miri functionality: can't call foreign function: foo', $DIR/unsupported_foreign_function.rs:9:9
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace