bpo-46006: Revert "bpo-40521: Per-interpreter interned strings (GH-20085)"#30422
Uh oh!
There was an error while loading. Please reload this page.
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
vstinner changed the title 
)" This reverts commit ea25180. Keep "assert(interned == NULL);" in _PyUnicode_Fini() but only for the main interpreter. Keep _PyUnicode_ClearInterned() changes avoiding the creation of a temporary Python list object.
MemberAuthor
vstinner commented Jan 5, 2022
Python 3.10 is also affected by https://bugs.python.org/issue46006. So I propose to revert the commit ea25180 in the 3.10 and main branches with this PR. This change is not a simple revert, I made manual changes to make the commit as small as possible, but keep interesting changes of the reverted commit, and not regression in bugs at the Python finalization (clear Python objects in the correct order). |
ericsnowcurrently approved these changes Jan 5, 2022
Member
ericsnowcurrently left a comment
ericsnowcurrently left a comment There was a problem hiding this comment.
LGTM
FWIW, moving it to _PyRuntimeState instead of back to a static would make sense. However, in the interest of the release that can be dealt with separately.
vstinner added a commit that referenced this pull request Jan 6, 2022
…GH-20085)" (GH-30422) (GH-30425) This reverts commit ea25180. Keep "assert(interned == NULL);" in _PyUnicode_Fini(), but only for the main interpreter. Keep _PyUnicode_ClearInterned() changes avoiding the creation of a temporary Python list object. Leave the PyInterpreterState structure unchanged to keep the ABI backward compatibility with Python 3.10.0: rename the "interned" member to "unused_interned". (cherry picked from commit 35d6540)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment
4 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.
This reverts commit ea25180.
Keep "assert(interned == NULL);" in _PyUnicode_Fini() but only for
the main interpreter.
Keep _PyUnicode_ClearInterned() changes avoiding the creation of a
temporary Python list object.
https://bugs.python.org/issue46006