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

Rustup

Author: bors

rust-version

@@ -1 +1 @@
-4007d4ef26eab44bdabc2b7574d032152264d3ad
+f5c81e0a986e4285d3d0fd781a1bd475753eb12c

src/eval.rs

@@ -24,6 +24,12 @@ pub struct MiriConfig {
     pub seed: Option<u64>,
 }
 
+/// Details of premature program termination.
+pub enum TerminationInfo {
+    Exit(i64),
+    Abort,
+}
+
 /// Returns a freshly created `InterpCx`, along with an `MPlaceTy` representing
 /// the location where the return value of the `start` lang item will be
 /// written to.
@@ -200,7 +206,15 @@ pub fn eval_main<'tcx>(tcx: TyCtxt<'tcx>, main_id: DefId, config: MiriConfig) ->
         Err(mut e) => {
             // Special treatment for some error kinds
             let msg = match e.kind {
-                InterpError::Exit(code) => return Some(code.into()),
+                InterpError::MachineStop(ref info) => {
+                    let info = info.downcast_ref::<TerminationInfo>()
+                        .expect("invalid MachineStop payload");
+                    match info {
+                        TerminationInfo::Exit(code) => return Some(*code),
+                        TerminationInfo::Abort =>
+                            format!("the evaluated program aborted execution")
+                    }
+                }
                 err_unsup!(NoMirFor(..)) =>
                     format!("{}. Did you set `MIRI_SYSROOT` to a Miri-enabled sysroot? You can prepare one with `cargo miri setup`.", e),
                 _ => e.to_string()

src/lib.rs

@@ -47,7 +47,7 @@ pub use crate::machine::{
     PAGE_SIZE, STACK_ADDR, STACK_SIZE, NUM_CPUS,
     MemoryExtra, AllocExtra, MiriMemoryKind, Evaluator, MiriEvalContext, MiriEvalContextExt,
 };
-pub use crate::eval::{eval_main, create_ecx, MiriConfig};
+pub use crate::eval::{eval_main, create_ecx, MiriConfig, TerminationInfo};
 
 /// Insert rustc arguments at the beginning of the argument list that Miri wants to be
 /// set per default, for maximal validation power.

src/shims/foreign_items.rs

@@ -152,9 +152,10 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             }
 
             "exit" | "ExitProcess" => {
-                // it's really u32 for ExitProcess, but we have to put it into the `Exit` error variant anyway
+                // it's really u32 for ExitProcess, but we have to put it into the `Exit` variant anyway
                 let code = this.read_scalar(args[0])?.to_i32()?;
-                return Err(InterpError::Exit(code).into());
+                let ti = Box::new(TerminationInfo::Exit(code.into()));
+                return Err(InterpError::MachineStop(ti).into());
             }
             _ => {
                 if let Some(p) = ret {

src/shims/intrinsics.rs

@@ -34,9 +34,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         // Handle diverging intrinsics.
         let (dest, ret) = match intrinsic_name {
             "abort" => {
-                // FIXME: Add a better way of indicating 'abnormal' termination,
-                // since this is not really an 'unsupported' behavior
-                throw_unsup_format!("the evaluated program aborted!");
+                let ti = Box::new(TerminationInfo::Abort);
+                return Err(InterpError::MachineStop(ti).into());
             }
             "miri_start_panic" => return this.handle_miri_start_panic(args, unwind),
             _ => {

tests/compile-fail/double_panic.rs

@@ -1,4 +1,4 @@
- //error-pattern: the evaluated program aborted
+ // error-pattern: the evaluated program aborted
 struct Foo;
 impl Drop for Foo {
     fn drop(&mut self) {

tests/run-pass/catch_panic.rs

@@ -70,17 +70,13 @@ fn test(do_panic: impl FnOnce(usize) -> !) {
         do_panic_counter(do_panic)
     })).expect_err("do_panic() did not panic!");
 
-    // See if we can extract panic message.
-    match res.downcast::<String>() {
-        Ok(s) => {
-            eprintln!("Caught panic message (String): {}", s);
-        }
-        Err(res) =>
-            if let Ok(s) = res.downcast::<&str>() {
-                eprintln!("Caught panic message (&str): {}", s);
-            } else {
-                eprintln!("Failed get caught panic message.");
-            }
+    // See if we can extract the panic message.
+    if let Some(s) = res.downcast_ref::<String>() {
+        eprintln!("Caught panic message (String): {}", s);
+    } else if let Some(s) = res.downcast_ref::<&str>() {
+        eprintln!("Caught panic message (&str): {}", s);
+    } else {
+        eprintln!("Failed get caught panic message.");
     }
 
     // Test flags.