Fix thread-safety in get_local_type_info()#5856
Merged
rwgk merged 1 commit intopybind:masterfrom Oct 12, 2025
Merged
Conversation
Fixes potential thread-safety issues if types are concurrently registered while `get_local_type_info()` is called in free threaded Python. Use the `internals` mutex to also protect `local_internals`. This keeps the locking strategy simpler, and we already follow this pattern in some places, such as `pybind11_meta_dealloc`.
Collaborator
rwgk
approved these changes
Oct 12, 2025
Collaborator
rwgk
left a comment
rwgk
left a comment
There was a problem hiding this comment.
This is slightly over my head TBH, but I think I understand this enough to be comfortable merging it.
Mostly just curious and to see if I understand correctly:
I find the foo_with_lock_held(); foo() { LOCK; foo_with_lock_held(); } pattern more readable than the with_internals pattern. Could we in theory replace all with_internals with the lock_held approach?
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
2 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.
Description
Fixes potential thread-safety issues if types are concurrently registered while
get_local_type_info()is called in free threaded Python.Use the
internalsmutex to also protectlocal_internals. This keeps the locking strategy simpler, and we already follow this pattern in some places, such aspybind11_meta_dealloc.Fixes #5799
Suggested changelog entry:
get_local_type_info()is called in free threaded Python.