gh-125996: fix thread safety of ordered dict #133734
Open
Conversation
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
picnixz
reviewed
May 17, 2025
colesbury
reviewed
May 27, 2025
Objects/odictobject.c
Outdated
| register PyODictObject *od = _PyODictObject_CAST(op); | ||
| PyDict_Clear(op); | ||
| _odict_clear_nodes(od); | ||
| PyDict_Clear((PyObject *)self); |
There was a problem hiding this comment.
_PyDict_Clear_LockHeld expects the critical section of the dict to be held but here in tp_clear it isn't held so critical section held assertions fail, should I also add the critical section to tp_clear?
Comment on lines
+1782
to
+1784
| #ifndef Py_GIL_DISABLED | ||
| Py_CLEAR(di->di_odict); | ||
| #endif |
There was a problem hiding this comment.
If we need to hold a lock for the iterator, we can keep the Py_CLEAR(di->di_odict);
Comment on lines
+1846
to
+1848
| #ifndef Py_GIL_DISABLED | ||
| Py_CLEAR(di->di_odict); | ||
| #endif |
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.
Uh oh!
There was an error while loading. Please reload this page.