-
-
Notifications
You must be signed in to change notification settings - Fork 31.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
gh-116510: Fix a Crash Due to Shared Immortal Interned Strings #124865
gh-116510: Fix a Crash Due to Shared Immortal Interned Strings #124865
Conversation
…ared immortal interned strings (pythongh-124646)" (pythongh-124807)" This reverts commit 7bdfabe.
!buildbot AMD64 Arch Linux TraceRefs |
🤖 New build scheduled with the buildbot fleet by @ericsnowcurrently for commit 623fb87 🤖 The command will test the builders whose names match following regular expression: The builders matched are:
|
@@ -2491,6 +2491,24 @@ _Py_ResurrectReference(PyObject *op) | |||
|
|||
|
|||
#ifdef Py_TRACE_REFS | |||
void | |||
_Py_NormalizeImmortalReference(PyObject *op) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Having some comment here would be helpful. Otherwise this function looks quite mysterious.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done!
LGTM other than adding a bit more comments. |
The buildbot passed. |
Any reason not to merge this now? |
I can merge it first thing tomorrow if no one objects. |
Thanks @ericsnowcurrently for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13. |
…ythongh-124865) Fix a crash caused by immortal interned strings being shared between sub-interpreters that use basic single-phase init. In that case, the string can be used by an interpreter that outlives the interpreter that created and interned it. For interpreters that share obmalloc state, also share the interned dict with the main interpreter. This is an un-revert of pythongh-124646 that then addresses the Py_TRACE_REFS failures identified by pythongh-124785. (cherry picked from commit f2cb399) Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
…ythongh-124865) Fix a crash caused by immortal interned strings being shared between sub-interpreters that use basic single-phase init. In that case, the string can be used by an interpreter that outlives the interpreter that created and interned it. For interpreters that share obmalloc state, also share the interned dict with the main interpreter. This is an un-revert of pythongh-124646 that then addresses the Py_TRACE_REFS failures identified by pythongh-124785. (cherry picked from commit f2cb399) Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
GH-125204 is a backport of this pull request to the 3.13 branch. |
GH-125205 is a backport of this pull request to the 3.12 branch. |
Due to either this change or #125199, the AMD64 Arch Linux TraceRefs 3.x buildbot is failing: https://buildbot.python.org/#/builders/484/builds/6022/steps/6/logs/stdio |
I checked with git bisect and the regression was introduced by commit f2cb399:
|
I'll take a look. |
…gh-124865) (gh-125709) (GH-125204) * gh-116510: Fix a Crash Due to Shared Immortal Interned Strings (gh-124865) Fix a crash caused by immortal interned strings being shared between sub-interpreters that use basic single-phase init. In that case, the string can be used by an interpreter that outlives the interpreter that created and interned it. For interpreters that share obmalloc state, also share the interned dict with the main interpreter. This is an un-revert of gh-124646 that then addresses the Py_TRACE_REFS failures identified by gh-124785. (cherry picked from commit f2cb399) Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com> * [3.13] gh-125286: Share the Main Refchain With Legacy Interpreters (gh-125709) They used to be shared, before 3.12. Returning to sharing them resolves a failure on Py_TRACE_REFS builds. --------- Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
…gh-125205) Fix a crash caused by immortal interned strings being shared between sub-interpreters that use basic single-phase init. In that case, the string can be used by an interpreter that outlives the interpreter that created and interned it. For interpreters that share obmalloc state, also share the interned dict with the main interpreter. This is an un-revert of gh-124646 that then addresses the Py_TRACE_REFS failures identified by gh-124785 (i.e. backporting gh-125709 too). (cherry picked from commit f2cb399, AKA gh-124865) Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
Fix a crash caused by immortal interned strings being shared between
sub-interpreters that use basic single-phase init. In that case, the string
can be used by an interpreter that outlives the interpreter that created and
interned it. For interpreters that share obmalloc state, also share the
interned dict with the main interpreter.
This is an un-revert of gh-124646 that addresses the
Py_TRACE_REFS
failures identified by gh-124785.The 3.12 backport will be slightly different and will need to be done manually.