Use UnsafeCell for fast constant thread locals#122583
Merged
Merged
Conversation
Collaborator
joboet
requested changes
Mar 16, 2024
joboet
left a comment
Member
There was a problem hiding this comment.
Looks good to me! Could you also remove the FIXME and the #[allow(static_mut_ref)] in line 16-18? They are no longer needed thanks to this change.
joboet
approved these changes
Mar 16, 2024
joboet
left a comment
Member
There was a problem hiding this comment.
I'm very confused by that one comment..
Member
|
Thank you! |
Collaborator
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 16, 2024
…enton Rollup of 7 pull requests Successful merges: - rust-lang#122323 (configure.py: add flag for loongarch64 musl-root) - rust-lang#122372 (prevent notifying the same changes more than once) - rust-lang#122390 (Bump windows-bindgen to 0.55.0) - rust-lang#122401 (Check library crates for all tier 1 targets in PR CI) - rust-lang#122489 (Bump `cargo update` PR more often) - rust-lang#122583 (Use `UnsafeCell` for fast constant thread locals) - rust-lang#122590 (bootstrap: Don't name things copy that are not copies) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 16, 2024
Rollup merge of rust-lang#122583 - Zoxc:tls-non-mut, r=joboet Use `UnsafeCell` for fast constant thread locals This uses `UnsafeCell` instead of `static mut` for fast constant thread locals. This changes the type of the TLS shims to return `&UnsafeCell<T>` instead of `*mut T` which means they are always non-null so LLVM can optimize away the check for `Some` in `LocalKey::with` if `T` has no destructor. LLVM is currently unable to do this optimization as we lose the fact that `__getit` always returns `Some` as it gets optimized to just returning the value of the TLS shim.
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
5 participants
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.
This uses
UnsafeCellinstead ofstatic mutfor fast constant thread locals. This changes the type of the TLS shims to return&UnsafeCell<T>instead of*mut Twhich means they are always non-null so LLVM can optimize away the check forSomeinLocalKey::withifThas no destructor.LLVM is currently unable to do this optimization as we lose the fact that
__getitalways returnsSomeas it gets optimized to just returning the value of the TLS shim.