Skip to content

gh-121954: Don't mutate tuples in _PyCode_New #122180

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

Draft
encukou wants to merge 20 commits into
base: main
Choose a base branch
from
Draft

gh-121954: Don't mutate tuples in _PyCode_New #122180

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3c7050e
Immortalize implicit arguments; use static sting for ".0"
encukou Jul 17, 2024
2ebe868
Intern mangled identifiers after creation
encukou Jul 17, 2024
7ba01d5
Create new tuples with _PyCode_New
encukou Jul 17, 2024
ff7f4e6
Intern strings in _PyCode_ConstantKey
encukou Jul 23, 2024
c2db0f0
Merge validate_and_copy_tuple into intern_names
encukou Jul 23, 2024
259d2ca
Remove test that asserted a constant is *not* interned
encukou Jul 23, 2024
891304d
Fix ref handling in error case
encukou Jul 23, 2024
1e655b2
Skip interning in _Py_Mangle (_PyCode_ConstantKey is enough)
encukou Jul 23, 2024
a75078f
Add blurb
encukou Jul 23, 2024
2557b5b
Immortalize localsplusnames
encukou Jul 24, 2024
9bca4c6
Free-threading: Re-add lock for intern_constants
encukou Jul 24, 2024
3939ac5
Merge in the main branch
encukou Aug 3, 2024
25dbda6
Intern tuples in free-threaded build
encukou Aug 3, 2024
b33c1eb
Intern the outer tuples like any other object
encukou Aug 3, 2024
cd6086f
Regenerate test_frozenmain.h
encukou Aug 3, 2024
ecd7ae7
Adjust comment for _PyCode_Fini
encukou Aug 12, 2024
34f5119
Merge in the main branch
encukou Aug 12, 2024
aa1a5ca
Add tests for converting to strict unicode
encukou Aug 12, 2024
e705379
Unlock mutex in error path
encukou Aug 12, 2024
ed6115f
Add braces to if bodies
encukou Aug 12, 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
Prev Previous commit
Next Next commit
Free-threading: Re-add lock for intern_constants
  • Loading branch information
@encukou
encukou committed Jul 24, 2024
commit 9bca4c69d133ada11fa6c963fa3f5a8dc5d1e04e
11 changes: 10 additions & 1 deletion Objects/codeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@ intern_names(PyObject *tuple)

Conceptually: return a new tuple.
(If no changes are needed, return a new ref to the argument.)

In the free-threaded build this needs a lock.
*/
static PyObject *
intern_constants(PyObject *tuple)
Expand Down Expand Up @@ -686,11 +688,18 @@ _PyCode_New(struct _PyCodeConstructor *con)
if (!names_interned) {
goto finally;
}
#ifdef Py_GIL_DISABLED
PyInterpreterState *interp = _PyInterpreterState_GET();
struct _py_code_state *state = &interp->code_state;
PyMutex_Lock(&state->mutex);
#endif
consts_interned = intern_constants(con->consts);
if (!consts_interned) {
goto finally;
}
localsplusnames_interned = intern_constants(con->localsplusnames);
#ifdef Py_GIL_DISABLED
PyMutex_Unlock(&state->mutex);
#endif
localsplusnames_interned = intern_names(con->localsplusnames);
if (!localsplusnames_interned) {
goto finally;
Expand Down