Skip to content

[3.12] gh-113993: Make interned strings mortal (GH-120520, GH-121364, GH-121903, GH-122303) #123065

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
Yhg1s merged 14 commits into from
Sep 27, 2024
Merged

[3.12] gh-113993: Make interned strings mortal (GH-120520, GH-121364, GH-121903, GH-122303) #123065

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9fd6334
[3.12] gh-113993: Allow interned strings to be mortal, and fix relate…
encukou Jun 24, 2024
9d4ade1
Put _Py_SetImmortal assertion in the old place
encukou Aug 15, 2024
1b8c12e
Create per-interpreter intern dict after init of deep-frozen modules
encukou Aug 15, 2024
aaa8afe
[3.12] gh-113993: Don't immortalize in PyUnicode_InternInPlace; keep …
encukou Jul 17, 2024
18b9ade
[3.12] gh-121863: Immortalize names in code objects to avoid crash (G…
encukou Jul 17, 2024
1d4a531
[3.12] gh-122291: Intern latin-1 one-byte strings at startup (GH-122303)
encukou Jul 27, 2024
cf6a27d
Adjust internal docs for 3.12
encukou Aug 15, 2024
fcee663
Regenerate the ABI dump (static strings are reorganized)
encukou Aug 19, 2024
0b10ee5
Don't link to the missing glossary term `immortal`.
encukou Aug 19, 2024
c405c0a
Merge branch '3.12' into mortal-interns-3.12
encukou Aug 19, 2024
2640dc8
Regenerate test_frozenmain.h
encukou Aug 20, 2024
50e1492
generate_global_objects.py: Fix name of macro in error message (#124464)
JelleZijlstra Sep 27, 2024
8583146
Merge in the main branch
encukou Sep 27, 2024
2d91ff9
Merge branch '3.12' into mortal-interns-3.12
Yhg1s Sep 27, 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
Create per-interpreter intern dict after init of deep-frozen modules
  • Loading branch information
@encukou
encukou committed Aug 16, 2024
commit 1b8c12eb4ae04f9f799f372aaf49712fff0ebf6d
3 changes: 2 additions & 1 deletion Include/internal/pycore_unicodeobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ extern "C" {

#include "pycore_fileutils.h" // _Py_error_handler
#include "pycore_ucnhash.h" // _PyUnicode_Name_CAPI
#include "pycore_global_objects.h" // _Py_SINGLETON

void _PyUnicode_ExactDealloc(PyObject *op);
Py_ssize_t _PyUnicode_InternedSize(void);
Py_ssize_t _PyUnicode_InternedSize_Immortal(void);

/* runtime lifecycle */

extern void _PyUnicode_InitState(PyInterpreterState *);
extern PyStatus _PyUnicode_InitGlobalObjects(PyInterpreterState *);
extern PyStatus _PyUnicode_InitInternDict(PyInterpreterState *);
extern PyStatus _PyUnicode_InitTypes(PyInterpreterState *);
extern void _PyUnicode_Fini(PyInterpreterState *);
extern void _PyUnicode_FiniTypes(PyInterpreterState *);
Expand Down
9 changes: 9 additions & 0 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14844,6 +14844,15 @@ _PyUnicode_InitGlobalObjects(PyInterpreterState *interp)
}
assert(INTERNED_STRINGS);

return _PyStatus_OK();
}


PyStatus
_PyUnicode_InitInternDict(PyInterpreterState *interp)
{
assert(INTERNED_STRINGS);

if (init_interned_dict(interp)) {
PyErr_Clear();
return _PyStatus_ERR("failed to create interned dict");
Expand Down
7 changes: 7 additions & 0 deletions Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,13 @@ pycore_interp_init(PyThreadState *tstate)
return _PyStatus_ERR("failed to initialize deep-frozen modules");
}

// Per-interpreter interned string dict is created after deep-frozen
// modules have interned the global strings.
status = _PyUnicode_InitInternDict(interp);
if (_PyStatus_EXCEPTION(status)) {
return status;
}

status = pycore_init_types(interp);
if (_PyStatus_EXCEPTION(status)) {
goto done;
Expand Down