Repository navigation
gh-157217: Fix dir() race when merging from a mappingproxy - #157279
Open
KingLizard1020 wants to merge 5 commits into
Open
KingLizard1020 wants to merge 5 commits into
KingLizard1020 wants to merge 5 commits into
Conversation
Copy link
Copy Markdown
Sorry, something went wrong.
KingLizard1020
requested review from
markshannon and
methane
as code owners
September 10, 2026 17:15
picnixz
reviewed
Sep 11, 2026
Comment thread
Include/internal/pycore_descrobject.h
Outdated
KingLizard1020
requested review from
AA-Turner,
JacobCoffee,
ezio-melotti,
hugovk,
itamaro and
webknjaz
as code owners
September 17, 2026 17:35
github-actions
Bot
force-pushed
the
gh-157217-fix
branch
from
a3a6cf9 to
c0381c5
Compare
September 17, 2026 17:36
Unwrap mappingproxy when it wraps a dict so dict_merge uses the locked dict-to-dict path. Add mappingproxy merge tests and a free-threading dir() race regression test.
github-actions
Bot
force-pushed
the
gh-157217-fix
branch
from
504aade to
7569c3b
Compare
September 17, 2026 18:04
Copy link
Copy Markdown
Member
|
@KingLizard1020 Please don't force push PRs. We squash merge at the end, and it's easier to review without force pushes. Also force pushes can end up spamming all the CODEOWNERS. https://devguide.python.org/getting-started/pull-request-lifecycle/#don-t-force-push Also please don't use things like .github/workflows/squash-once.yml to squash for you: It's confusing to see GitHub Actions force push, and also it requested reviews from 6 people in CODEOWNERs for GHA files. Same applies to #157691. Thanks! |
Sorry, something went wrong.
hugovk
removed request for
AA-Turner,
JacobCoffee,
ezio-melotti,
hugovk,
itamaro and
webknjaz
September 18, 2026 10:33
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
Reviewers
3 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.
dir(), dict(vars(cls)), and {**vars(cls)} go through dict_merge() on a mappingproxy of the class dict. The generic merge path called PyMapping_Keys() without holding the wrapped dict's critical section. On the free-threaded build, a concurrent insert (for example the first access to __annotations__, which stores __annotations_cache__) raised RuntimeError: dictionary changed size during iteration.
Unwrap types.MappingProxyType when it wraps a dict so the locked dict-to-dict path is used. Py_BEGIN_CRITICAL_SECTION2 already treats a self-merge (a == source) as a single mutex.
Tests:
Fixes #157217