Add an optional message to abort

Author: elichai

src/diagnostics.rs

@@ -20,7 +20,8 @@ pub fn report_diagnostic<'tcx, 'mir>(
             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"),
+                TerminationInfo::Abort(None) => format!("the evaluated program aborted execution"),
+                TerminationInfo::Abort(Some(msg)) => format!("the evaluated program aborted execution: {}", msg),
             }
         }
         err_unsup!(NoMirFor(..)) => format!(

src/eval.rs

@@ -53,7 +53,7 @@ impl Default for MiriConfig {
 /// Details of premature program termination.
 pub enum TerminationInfo {
     Exit(i64),
-    Abort,
+    Abort(Option<String>),
 }
 
 /// Returns a freshly created `InterpCx`, along with an `MPlaceTy` representing

src/machine.rs

@@ -273,7 +273,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'tcx> {
 
     #[inline(always)]
     fn abort(_ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx, !> {
-        throw_machine_stop!(TerminationInfo::Abort)
+        throw_machine_stop!(TerminationInfo::Abort(None))
     }
 
     #[inline(always)]