From ab000997dbc597416c151e7879bb113c56146228 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 2 Dec 2019 11:02:11 +0100
Subject: [PATCH] use throw_machine_stop macro

---
 src/shims/foreign_items.rs | 3 +--
 src/shims/intrinsics.rs    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/shims/foreign_items.rs b/src/shims/foreign_items.rs
index 52e04aea304..316cc686ad7 100644
--- a/src/shims/foreign_items.rs
+++ b/src/shims/foreign_items.rs
@@ -154,8 +154,7 @@ 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` variant anyway
                 let code = this.read_scalar(args[0])?.to_i32()?;
-                let ti = Box::new(TerminationInfo::Exit(code.into()));
-                return Err(InterpError::MachineStop(ti).into());
+                throw_machine_stop!(TerminationInfo::Exit(code.into()));
             }
             _ => {
                 if let Some(p) = ret {
diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs
index 0cb51d59319..57b77a8b749 100644
--- a/src/shims/intrinsics.rs
+++ b/src/shims/intrinsics.rs
@@ -34,8 +34,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         // Handle diverging intrinsics.
         let (dest, ret) = match intrinsic_name {
             "abort" => {
-                let ti = Box::new(TerminationInfo::Abort);
-                return Err(InterpError::MachineStop(ti).into());
+                throw_machine_stop!(TerminationInfo::Abort);
             }
             "miri_start_panic" => return this.handle_miri_start_panic(args, unwind),
             _ => {