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

rustup, test Abort terminator

Author: bors

rust-version

@@ -1 +1 @@
-c20d7eecbc0928b57da8fe30b2ef8528e2bdd5be
+54b7d21f59a363e53eb1c31d76b40af2ff99321c

src/lib.rs

@@ -1,6 +1,7 @@
 #![feature(rustc_private)]
 #![feature(option_expect_none, option_unwrap_none)]
 #![feature(map_first_last)]
+#![feature(never_type)]
 #![warn(rust_2018_idioms)]
 #![allow(clippy::cast_lossless)]
 

src/machine.rs

@@ -271,6 +271,11 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'tcx> {
         ecx.assert_panic(msg, unwind)
     }
 
+    #[inline(always)]
+    fn abort(_ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx, !> {
+        throw_machine_stop!(TerminationInfo::Abort)
+    }
+
     #[inline(always)]
     fn binary_ptr_op(
         ecx: &rustc_mir::interpret::InterpCx<'mir, 'tcx, Self>,

src/shims/intrinsics.rs

@@ -34,6 +34,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         // Handle diverging intrinsics.
         let (dest, ret) = match intrinsic_name {
             "abort" => {
+                // FIXME: remove, once the intrinsic on the rustc side is fixed.
                 throw_machine_stop!(TerminationInfo::Abort);
             }
             "miri_start_panic" => return this.handle_miri_start_panic(args, unwind),

tests/compile-fail/abort-terminator.rs

@@ -0,0 +1,9 @@
+// error-pattern: the evaluated program aborted
+#![feature(unwind_attributes)]
+
+#[unwind(aborts)]
+fn panic_abort() { panic!() }
+
+fn main() {
+    panic_abort();
+}