Skip to content

linux thread_atexit: fix use of __dso_handle #164576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Oct 19, 2026
Merged

linux thread_atexit: fix use of __dso_handle #164576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions library/std/src/sys/thread_local/destructors/linux_like.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,17 @@ pub unsafe fn register(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) {
>;
}

if let Some(f) = unsafe { __cxa_thread_atexit_impl } {
if let Some(f) = unsafe { __cxa_thread_atexit_impl }
&& let dso = unsafe { __dso_handle }
&& !dso.is_null()
{
unsafe {
f(
transmute::<unsafe extern "C" fn(*mut u8), unsafe extern "C" fn(*mut libc::c_void)>(
dtor,
),
t.cast(),
(&raw const __dso_handle) as *mut _,
dso as *mut _,
);
}
} else {
Expand Down
Loading