Fix Key interning race. (#12152)
#12160
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
|
N.B.: Not a clean cherry-pick. The rust upgrade in #11940 led to s/FNV/Fnv/. |
Eric-Arellano
approved these changes
Jun 1, 2021
Previously a `Key` could be observed before it was added to the `reverse_keys` mapping leading to a panic in `key_get`. That panic used a debug format on the problematic key and the `Debug` impl for `Key` indirectly uses `key_get`. This results in a panic while handling a panic. Fix the root cause of the panic, ensuring the panic can never happen as was intended. Also fix the recursive use of `key_get` in the panic for sanity sake. Fixes pantsbuild#11926 (cherry picked from commit a59be85) [ci skip-build-wheels]
jsirois
force-pushed
the
pr/12152/cherry-pick/2.3.x
branch
from
31bd58a to
d261d2f
Compare
# Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
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.
Previously a
Keycould be observed before it was added to thereverse_keysmapping leading to a panic inkey_get. That panic useda debug format on the problematic key and the
Debugimpl forKeyindirectly uses
key_get. This results in a panic while handling apanic.
Fix the root cause of the panic, ensuring the panic can never happen
as was intended. Also fix the recursive use of
key_getin the panicfor sanity sake.
Fixes #11926
(cherry picked from commit a59be85)
[ci skip-build-wheels]