fix: Fix overly strict volatile reads in Windows TLS implementation #147424
+3
−3
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.
The current TLS implementation introduced with f3facf1 is overly strict:
It assumes the TLS callback and
_tls_used
to be aligned while not mandating this alignment with#[repr(align(...))]
.Two solutions to this problem are conceivable:
read_volatile
and mandate a usize-alignment.read_volatile
withread_unaligned
.This PR chooses to implement the latter, as there is no general requirement for keeping these pointers aligned.
Replacing
read_volatile
withread_unaligned
should be fine in this case, as we do not care about the reads being reordered (they only exist to prevent the variables from being optimized away).