nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move unique_thread_exit call to lang_start_internal so it is not in a generic function, and wrap it in catch_unwind

Browse Source
This commit is contained in:
Zachary S 2024-07-03 13:45:37 -05:00
parent b512608275
commit b4149c6ad4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/std/src/rt.rs
View File

@ -144,6 +144,10 @@ fn lang_start_internal(
rtabort!("drop of the panic payload panicked");
});
panic::catch_unwind(cleanup).map_err(rt_abort)?;
// Guard against multple threads calling `libc::exit` concurrently.
// See the documentation for `unique_thread_exit` for more information.
panic::catch_unwind(|| crate::sys::common::exit_guard::unique_thread_exit())
.map_err(rt_abort)?;
ret_code
}
@ -161,8 +165,5 @@ fn lang_start<T: crate::process::Termination + 'static>(
argv,
sigpipe,
);
// Guard against multple threads calling `libc::exit` concurrently.
// See the documentation for `unique_thread_exit` for more information.
crate::sys::common::exit_guard::unique_thread_exit();
v
}