Simplify GlobalTypeMapper locking and fix races#6538
Merged
Conversation
vonzshik
reviewed
Apr 10, 2026
There was a problem hiding this comment.
Pull request overview
This PR simplifies thread-safety in GlobalTypeMapper by replacing ReaderWriterLockSlim-based locking with a single monitor lock and by restructuring the cached type-mapping options construction/invalidation to reduce race windows.
Changes:
- Replaced
ReaderWriterLockSlimusage with a singlelock (_sync)for all mutable global-mapper state. - Simplified cache invalidation by directly nulling
_typeMappingOptionsin mutation paths. - Refactored type-mapping options creation into
BuildTypeMappingOptions()with a lock-guarded initialization path.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
vonzshik
approved these changes
Apr 14, 2026
NinoFloris
added a commit
that referenced
this pull request
Apr 20, 2026
(cherry picked from commit 44f1394)
NinoFloris
added a commit
that referenced
this pull request
Apr 20, 2026
(cherry picked from commit 44f1394)
NinoFloris
added a commit
that referenced
this pull request
Apr 20, 2026
(cherry picked from commit 44f1394)
NinoFloris
added a commit
that referenced
this pull request
Apr 20, 2026
(cherry picked from commit 44f1394)
Member
Author
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
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 some races that are theoretically there but practically don't get hit. This code has not really needed to change (or had any issues related to it) since we removed the complexity from the global mapper in 8.0. Either way it seems good to get this into a 'stupid simple good' state for future reference of the desired behavior, during our deliberately long obsoletion window.
At some point we can just take the global mapper internal as-is for its only remaining use, static/global parameter type inference.