fix aliasing violations in thread_local_const_init #84291
Merged
Conversation
This file contains 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
rust-highfive
added
the
S-waiting-on-review
RalfJung
commented
Apr 18, 2021
| @@ -217,7 +217,7 @@ macro_rules! __thread_local_inner { | |||
| // so now. | |||
| 0 => { | |||
| $crate::thread::__FastLocalKeyInner::<$t>::register_dtor( | |||
| &VAL as *const _ as *mut u8, | |||
| $crate::ptr::addr_of_mut!(VAL) as *mut u8, | |||
There was a problem hiding this comment.
Note that &mut VAL as *mut _ as *mut u8 would not be right as the &mut here would make a unique pointer which (together with the raw ptrs derived from it) becomes invalid when &VAL is executed later.
|
@bors: r+ |
|
📌 Commit 7a5418d has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 19, 2021
Rollup of 7 pull requests Successful merges: - rust-lang#84123 (Introduce CompileMonoItem DepNode) - rust-lang#84126 (Enable sanitizers for x86_64-unknown-linux-musl) - rust-lang#84168 (Lower async fn in traits.) - rust-lang#84256 (doc: use U+2212 for minus sign in floating-point -0.0 remarks) - rust-lang#84291 (fix aliasing violations in thread_local_const_init) - rust-lang#84313 (fix suggestion for unsized function parameters) - rust-lang#84330 (Remove unused footer section) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang/miri
that referenced
this pull request
Apr 20, 2021
test thread_local_const_init Blocked on rust-lang/rust#84291
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.
Fixes #83416 (comment)
r? @alexcrichton @sfackler