Skip to content

Avoid depending on Julia-patched libunwind ABI #59266

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
merged 2 commits into from
Aug 21, 2025
Merged

Avoid depending on Julia-patched libunwind ABI #59266

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61c752c
Make libunwind more compatible if we don't load our own copy
gbaraldi Aug 13, 2025
ae5a7bb
Make analyzegc happy
gbaraldi Aug 15, 2025
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
10 changes: 5 additions & 5 deletions src/threading.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,10 +313,7 @@ JL_DLLEXPORT uint64_t jl_get_ptls_rng(void) JL_NOTSAFEPOINT
return jl_current_task->ptls->rngseed;
}


#if !defined(_OS_WINDOWS_) && !defined(JL_DISABLE_LIBUNWIND) && !defined(LLVMLIBUNWIND)
extern int unw_ensure_tls (void);
#endif
typedef void (*unw_tls_ensure_func)(void) JL_NOTSAFEPOINT;

// get thread local rng
JL_DLLEXPORT void jl_set_ptls_rng(uint64_t new_seed) JL_NOTSAFEPOINT
Expand Down Expand Up @@ -403,7 +400,10 @@ jl_ptls_t jl_init_threadtls(int16_t tid)
#if !defined(_OS_WINDOWS_) && !defined(JL_DISABLE_LIBUNWIND) && !defined(LLVMLIBUNWIND)
// ensures libunwind TLS space for this thread is allocated eagerly
// to make unwinding async-signal-safe even when using thread local caches.
unw_ensure_tls();
unw_tls_ensure_func jl_unw_ensure_tls = NULL;
jl_dlsym(jl_exe_handle, "unw_ensure_tls", (void**)&jl_unw_ensure_tls, 0);
if (jl_unw_ensure_tls)
jl_unw_ensure_tls();
#endif

return ptls;
Expand Down