Skip to content

gh-125900: Clean-up logic around immortalization in free-threading #125901

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Oct 24, 2024
Merged

gh-125900: Clean-up logic around immortalization in free-threading #125901

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70b2efd
gh-125900: Clean-up logic around immortalization in free-threading
colesbury Oct 20, 2024
acc19d1
Remove additional special cases
colesbury Oct 23, 2024
c6ab225
Clean up import
colesbury Oct 24, 2024
2b5c4de
Rename suppress_immortalization to suppress_co_const_immortalization
colesbury Oct 24, 2024
131de47
Remove stray change
colesbury Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Include/internal/pycore_tstate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ typedef struct _PyThreadStateImpl {
} refcounts;

// When >1, code objects do not immortalize their non-string constants.
int suppress_immortalization;
int suppress_co_const_immortalization;
#endif

#if defined(Py_REF_DEBUG) && defined(Py_GIL_DISABLED)
Expand Down
1 change: 1 addition & 0 deletions Lib/test/test_ast/test_ast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2277,6 +2277,7 @@ def test_values(self):
for value in values:
with self.subTest(value=value):
result = self.compile_constant(value)
self.assertIs(result, value)
self.assertEqual(result, value)

def test_assign_to_constant(self):
Expand Down
2 changes: 1 addition & 1 deletion Objects/codeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ intern_constants(PyObject *tuple, int *modified)
// Intern non-string constants in the free-threaded build
_PyThreadStateImpl *tstate = (_PyThreadStateImpl *)_PyThreadState_GET();
if (!_Py_IsImmortal(v) && !PyCode_Check(v) &&
!PyUnicode_CheckExact(v) && !tstate->suppress_immortalization)
!PyUnicode_CheckExact(v) && !tstate->suppress_co_const_immortalization)
{
PyObject *interned = intern_one_constant(v);
if (interned == NULL) {
Expand Down
8 changes: 4 additions & 4 deletions Python/bltinmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,13 +871,13 @@ builtin_compile_impl(PyObject *module, PyObject *source, PyObject *filename,
// compile() calls to get consistent frozen outputs between the default
// and free-threaded builds.
_PyThreadStateImpl *tstate = (_PyThreadStateImpl *)_PyThreadState_GET();
tstate->suppress_immortalization++;
tstate->suppress_co_const_immortalization++;
#endif

result = Py_CompileStringObject(str, filename, start[compile_mode], &cf, optimize);

#ifdef Py_GIL_DISABLED
tstate->suppress_immortalization--;
tstate->suppress_co_const_immortalization--;
#endif

Py_XDECREF(source_copy);
Expand Down Expand Up @@ -1027,11 +1027,11 @@ builtin_eval_impl(PyObject *module, PyObject *source, PyObject *globals,
// Don't immortalize code constants for explicit eval() calls
// to avoid memory leaks.
_PyThreadStateImpl *tstate = (_PyThreadStateImpl *)_PyThreadState_GET();
tstate->suppress_immortalization++;
tstate->suppress_co_const_immortalization++;
#endif
result = PyRun_StringFlags(str, Py_eval_input, globals, locals, &cf);
#ifdef Py_GIL_DISABLED
tstate->suppress_immortalization--;
tstate->suppress_co_const_immortalization--;
#endif
Py_XDECREF(source_copy);
}
Expand Down
Loading