Skip to content

gh-152238: Revert gh-150490 and gh-152200.#152232

Merged
nascheme merged 1 commit into
python:mainfrom
nascheme:gh-151593-revert-150489-and-152200
Jun 26, 2026
Merged

gh-152238: Revert gh-150490 and gh-152200.#152232
nascheme merged 1 commit into
python:mainfrom
nascheme:gh-151593-revert-150489-and-152200

Conversation

@nascheme

@nascheme nascheme commented Jun 25, 2026

Copy link
Copy Markdown
Member

Revert commits:
gh-151593: Fix dead lock in PyDict insert_split_key() (#152200)
gh-150490: Raise PyType_Modified for insertion into split dictionary (#150489)

For gh-150489, it violates locking discipline and results in deadlocks, gh-151593 is an example of it being hit in CI. The attempted fix of gh-152200 avoids the deadlock but introduces a data-race. The race window is small but can be triggered with pure Python code.

Revert commits:
    pythongh-151593: Fix dead lock in PyDict insert_split_key() (python#152200)
    pythongh-150490: Raise PyType_Modified for insertion into split dictionary (python#150489)

For pythongh-150489, it violates locking discipline and results in deadlocks,
pythongh-151593 is an example of it being hit in CI.  The attempted fix of
pythongh-152200 avoids the deadlock but introduces a data-race.  The race
window is small but can be triggered with pure Python code.
@nascheme nascheme changed the title gh-151593: Revert gh-150490 and gh-152200. gh-152238: Revert gh-150490 and gh-152200. Jun 25, 2026
@nascheme nascheme marked this pull request as ready for review June 25, 2026 22:01
@nascheme nascheme merged commit 9626ef8 into python:main Jun 26, 2026
85 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants