Auto merge of #152657 - joboet:move_pal_exit, r=<try>

std: move `exit` out of PAL


try-job: test-various

Author: bors

library/std/src/process.rs

@@ -2464,7 +2464,7 @@ impl Child {
 #[cfg_attr(not(test), rustc_diagnostic_item = "process_exit")]
 pub fn exit(code: i32) -> ! {
     crate::rt::cleanup();
-    crate::sys::os::exit(code)
+    crate::sys::exit::exit(code)
 }
 
 /// Terminates the process in an abnormal fashion.

library/std/src/rt.rs

@@ -187,7 +187,7 @@ fn lang_start_internal(
         cleanup();
         // Guard against multiple threads calling `libc::exit` concurrently.
         // See the documentation for `unique_thread_exit` for more information.
-        crate::sys::exit_guard::unique_thread_exit();
+        crate::sys::exit::unique_thread_exit();
 
         ret_code
     })

library/std/src/sys/exit_guard.rs library/std/src/sys/exit.rslibrary/std/src/sys/exit_guard.rs renamed to library/std/src/sys/exit.rs

@@ -19,8 +19,7 @@ cfg_select! {
         /// * If it is called again on the same thread as the first call, it will abort.
         /// * If it is called again on a different thread, it will wait in a loop
         ///   (waiting for the process to exit).
-        #[cfg_attr(any(test, doctest), allow(dead_code))]
-        pub(crate) fn unique_thread_exit() {
+        pub fn unique_thread_exit() {
             use crate::ffi::c_int;
             use crate::ptr;
             use crate::sync::atomic::AtomicPtr;
@@ -62,9 +61,78 @@ cfg_select! {
         ///
         /// Mitigation is ***NOT*** implemented on this platform, either because this platform
         /// is not affected, or because mitigation is not yet implemented for this platform.
-        #[cfg_attr(any(test, doctest), allow(dead_code))]
-        pub(crate) fn unique_thread_exit() {
+        #[cfg_attr(any(test, doctest), expect(dead_code))]
+        pub fn unique_thread_exit() {
             // Mitigation not required on platforms where `exit` is thread-safe.
         }
     }
 }
+
+pub fn exit(code: i32) -> ! {
+    cfg_select! {
+        target_os = "hermit" => {
+            unsafe { hermit_abi::exit(code) }
+        }
+        target_os = "linux" => {
+            unsafe {
+                unique_thread_exit();
+                libc::exit(code)
+            }
+        }
+        target_os = "motor" => {
+            moto_rt::process::exit(code)
+        }
+        all(target_vendor = "fortanix", target_env = "sgx") => {
+            crate::sys::pal::abi::exit_with_code(code as _)
+        }
+        target_os = "solid_asp3" => {
+            rtabort!("exit({}) called", code)
+        }
+        target_os = "teeos" => {
+            panic!("TA should not call `exit`")
+        }
+        target_os = "uefi" => {
+            if let (Some(boot_services), Some(handle)) =
+                (uefi::env::boot_services(), uefi::env::try_image_handle())
+            {
+                let boot_services: NonNull<r_efi::efi::BootServices> = boot_services.cast();
+                let _ = unsafe {
+                    ((*boot_services.as_ptr()).exit)(
+                        handle.as_ptr(),
+                        Status::from_usize(code as usize),
+                        0,
+                        crate::ptr::null_mut(),
+                    )
+                };
+            }
+            crate::intrinsics::abort()
+        }
+        any(
+            target_family = "unix",
+            target_os = "wasi",
+        ) => {
+            unsafe { libc::exit(code as crate::ffi::c_int) }
+        }
+        target_os = "vexos" => {
+            drop(code);
+
+            unsafe {
+                vex_sdk::vexSystemExitRequest();
+
+                loop {
+                    vex_sdk::vexTasksRun();
+                }
+            }
+        }
+        target_os = "windows" => {
+            unsafe { crate::sys::pal::c::ExitProcess(code as u32) }
+        }
+        target_os = "xous" => {
+            crate::os::xous::ffi::exit(code as u32)
+        }
+        _ => {
+            drop(code);
+            crate::intrinsics::abort()
+        }
+    }
+}

library/std/src/sys/mod.rs

@@ -11,7 +11,7 @@ pub mod backtrace;
 pub mod cmath;
 pub mod env;
 pub mod env_consts;
-pub mod exit_guard;
+pub mod exit;
 pub mod fd;
 pub mod fs;
 pub mod io;

library/std/src/sys/pal/hermit/os.rs

@@ -57,10 +57,6 @@ pub fn home_dir() -> Option<PathBuf> {
     None
 }
 
-pub fn exit(code: i32) -> ! {
-    unsafe { hermit_abi::exit(code) }
-}
-
 pub fn getpid() -> u32 {
     unsafe { hermit_abi::getpid() as u32 }
 }

library/std/src/sys/pal/motor/os.rs

@@ -63,10 +63,6 @@ pub fn home_dir() -> Option<PathBuf> {
     None
 }
 
-pub fn exit(code: i32) -> ! {
-    moto_rt::process::exit(code)
-}
-
 pub fn getpid() -> u32 {
     panic!("Pids on Motor OS are u64.")
 }

library/std/src/sys/pal/sgx/os.rs

@@ -56,10 +56,6 @@ pub fn home_dir() -> Option<PathBuf> {
     None
 }
 
-pub fn exit(code: i32) -> ! {
-    super::abi::exit_with_code(code as _)
-}
-
 pub fn getpid() -> u32 {
     panic!("no pids in SGX")
 }

library/std/src/sys/pal/solid/os.rs

@@ -63,10 +63,6 @@ pub fn home_dir() -> Option<PathBuf> {
     None
 }
 
-pub fn exit(code: i32) -> ! {
-    rtabort!("exit({}) called", code);
-}
-
 pub fn getpid() -> u32 {
     panic!("no pids on this platform")
 }

library/std/src/sys/pal/teeos/os.rs

@@ -67,10 +67,6 @@ pub fn home_dir() -> Option<PathBuf> {
     None
 }
 
-pub fn exit(_code: i32) -> ! {
-    panic!("TA should not call `exit`")
-}
-
 pub fn getpid() -> u32 {
     panic!("no pids on this platform")
 }

library/std/src/sys/pal/uefi/os.rs

@@ -105,23 +105,6 @@ pub fn home_dir() -> Option<PathBuf> {
     None
 }
 
-pub fn exit(code: i32) -> ! {
-    if let (Some(boot_services), Some(handle)) =
-        (uefi::env::boot_services(), uefi::env::try_image_handle())
-    {
-        let boot_services: NonNull<r_efi::efi::BootServices> = boot_services.cast();
-        let _ = unsafe {
-            ((*boot_services.as_ptr()).exit)(
-                handle.as_ptr(),
-                Status::from_usize(code as usize),
-                0,
-                crate::ptr::null_mut(),
-            )
-        };
-    }
-    crate::intrinsics::abort()
-}
-
 pub fn getpid() -> u32 {
     panic!("no pids on this platform")
 }