Added a thread_local guard to trigger dtor hook before fibers are used#12426
Merged
alexcrichton merged 2 commits intobytecodealliance:mainfrom Jan 28, 2026
Merged
Conversation
Member
|
Thanks for this! If you've got a test that'd be awesome to add, but no need to go out of your way for that. You can feel free to add it to this crate itself or in the top level |
0895e3a to
79915e3
Compare
alexcrichton
approved these changes
Jan 28, 2026
Member
|
Thanks so much again for this! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow to rust-lang/rust#148799, specifically @alexcrichton's comment.
Summary: rust-lang/rust#148799 switches the way destructors for thread locals are scheduled on Windows, and will now use Fiber Local Storage (
FlsAllocaccepts a callback that is called on fiber/thread/process exit).Because
wasmtimeuses Fibers on Windows to support async functions, it now need to make sure that this hook is registered before Fibers are used.To do that, we create an additional TLS variable with a
Dropimpl, and use it just before callingConvertThreadToFiber. BecauseConvertFiberToThreadis already called before exiting, this guarantees that the hook will both be registered correctly, and invoked when the thread exits.If a fiber does exit abnormally, it's possible that
ConvertFiberToThreadwon't be called, in which case thread locals withDropimpls will be leaked.@alexcrichton - let me know if you want me to add a
resume_separate_thread-like test that uses thread locals + a "native" os thread (== one that isn't initialized with the Rust runtime).