thread_local: be excruciatingly explicit in dtor code#124387
Merged
bors merged 3 commits intorust-lang:masterfrom Apr 27, 2024
Merged
thread_local: be excruciatingly explicit in dtor code#124387bors merged 3 commits intorust-lang:masterfrom
bors merged 3 commits intorust-lang:masterfrom
Conversation
rustbot
added
S-waiting-on-review
Instead, use raw pointers to accomplish internal mutability throughout.
workingjubilee
force-pushed
the
use-raw-pointers-in-thread-locals
branch
from
141bba9 to
496fa7f
Compare
workingjubilee
changed the title
LazyKeyInner::take to use less &mut Tsthread_local: be excruciatingly explicit in dtor code
workingjubilee
changed the title
thread_local: be excruciatingly explicit in dtor code
workingjubilee
force-pushed
the
use-raw-pointers-in-thread-locals
branch
from
496fa7f to
43f21a6
Compare
workingjubilee
commented
Apr 25, 2024
Comment on lines
+241
to
243
| let value = inner.take(); | ||
| dtor_state.set(DtorState::RunningOrHasRun); | ||
| drop(value); |
Member
Author
There was a problem hiding this comment.
something that's not clear to me is whether we can simply rearrange this: do dtor_state.set(DtorState::RunningOrHasRun) and then call the more lightweight drop_in_place?
Member
There was a problem hiding this comment.
We could, and there are some other improvements possible as well, see #116123.
Comment on lines
+240
to
+241
| let Key { inner, dtor_state } = &*ptr; | ||
| let value = inner.take(); |
Member
Author
There was a problem hiding this comment.
The purpose of adding this two-step is to make it clear, combined with the other change, that we are using internal mutability and not relying on upgrading the pointer to &mut.
joboet
approved these changes
Apr 26, 2024
Member
joboet
left a comment
joboet
left a comment
There was a problem hiding this comment.
👍
r=me with the updated safety comment
Comment on lines
+241
to
243
| let value = inner.take(); | ||
| dtor_state.set(DtorState::RunningOrHasRun); | ||
| drop(value); |
Member
There was a problem hiding this comment.
We could, and there are some other improvements possible as well, see #116123.
Co-authored-by: joboet <jonasboettiger@icloud.com>
Member
Author
|
@bors r=joboet rollup |
Collaborator
bors
added
S-waiting-on-bors
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Apr 27, 2024
…-thread-locals, r=joboet thread_local: be excruciatingly explicit in dtor code Use raw pointers to accomplish internal mutability, and clearly split references where applicable. This reduces the likelihood that any of these parts are misunderstood, either by humans or the compiler's optimizations. Fixes rust-lang#124317 r? `@joboet`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 27, 2024
Rollup of 3 pull requests Successful merges: - rust-lang#124370 (Fix substitution parts having a shifted underline in some cases) - rust-lang#124382 (ast: Generalize item kind visiting) - rust-lang#124387 (thread_local: be excruciatingly explicit in dtor code) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 27, 2024
…iaskrgr Rollup of 3 pull requests Successful merges: - rust-lang#124382 (ast: Generalize item kind visiting) - rust-lang#124387 (thread_local: be excruciatingly explicit in dtor code) - rust-lang#124427 (Add missing tests for an ICE) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 27, 2024
Rollup merge of rust-lang#124387 - workingjubilee:use-raw-pointers-in-thread-locals, r=joboet thread_local: be excruciatingly explicit in dtor code Use raw pointers to accomplish internal mutability, and clearly split references where applicable. This reduces the likelihood that any of these parts are misunderstood, either by humans or the compiler's optimizations. Fixes rust-lang#124317 r? ``@joboet``
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
4 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.
Use raw pointers to accomplish internal mutability, and clearly split references where applicable. This reduces the likelihood that any of these parts are misunderstood, either by humans or the compiler's optimizations.
Fixes #124317
r? @joboet