????

Author: nia-e

src/bin/miri.rs

@@ -213,6 +213,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
                     if !many_seeds.keep_going {
                         // `abort_if_errors` would actually not stop, since `par_for_each` waits for the
                         // rest of the to finish, so we just exit immediately.
+                        miri::register_retcode_sv(return_code);
                         std::process::exit(return_code);
                     }
                     exit_code.store(return_code, Ordering::Relaxed);
@@ -223,7 +224,9 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
             if num_failed > 0 {
                 eprintln!("{num_failed}/{total} SEEDS FAILED", total = many_seeds.seeds.count());
             }
-            std::process::exit(exit_code.0.into_inner());
+            let code = exit_code.0.into_inner();
+            miri::register_retcode_sv(code);
+            std::process::exit(code);
         } else {
             let return_code = miri::eval_entry(tcx, entry_def_id, entry_type, &config, None)
                 .unwrap_or_else(|| {
@@ -232,6 +235,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
                     tcx.dcx().abort_if_errors();
                     rustc_driver::EXIT_FAILURE
                 });
+            miri::register_retcode_sv(return_code);
             std::process::exit(return_code);
         }
 
@@ -329,6 +333,7 @@ impl rustc_driver::Callbacks for MiriBeRustCompilerCalls {
 
 fn show_error(msg: &impl std::fmt::Display) -> ! {
     eprintln!("fatal error: {msg}");
+    miri::register_retcode_sv(1);
     std::process::exit(1)
 }
 
@@ -403,6 +408,7 @@ fn run_compiler_and_exit(
     // Invoke compiler, and handle return code.
     let exit_code =
         rustc_driver::catch_with_exit_code(move || rustc_driver::run_compiler(args, callbacks));
+    miri::register_retcode_sv(exit_code);
     std::process::exit(exit_code)
 }
 
@@ -482,7 +488,10 @@ fn main() {
     let env_snapshot = env::vars_os().collect::<Vec<_>>();
 
     let args = rustc_driver::catch_fatal_errors(|| rustc_driver::args::raw_args(&early_dcx))
-        .unwrap_or_else(|_| std::process::exit(rustc_driver::EXIT_FAILURE));
+        .unwrap_or_else(|_| {
+            miri::register_retcode_sv(rustc_driver::EXIT_FAILURE);
+            std::process::exit(rustc_driver::EXIT_FAILURE)
+        });
 
     // Install the ctrlc handler that sets `rustc_const_eval::CTRL_C_RECEIVED`, even if
     // MIRI_BE_RUSTC is set.

src/shims/trace/child.rs

@@ -202,9 +202,8 @@ pub unsafe fn init_sv() -> Result<(), SvInitError> {
                         // Ptrace works :D
                         Ok(_) => {
                             let code = sv_loop(listener, child, event_tx, confirm_tx).unwrap_err();
-                            // If a return code of 0 is not explicitly given, assume something went
-                            // wrong and return 1.
-                            std::process::exit(code.unwrap_or(1))
+                            //eprintln!("Code: {code:?}");
+                            std::process::exit(code.unwrap_or(0))
                         }
                         // Ptrace does not work and we failed to catch that.
                         Err(_) => {

src/shims/trace/parent.rs

@@ -335,6 +335,7 @@ pub fn sv_loop(
                 ptrace::syscall(pid, None).unwrap();
             }
             ExecEvent::Died(code) => {
+                //eprintln!("Died: {code:?}");
                 return Err(code);
             }
         }