diff options
author | Petr Viktorin <encukou@gmail.com> | 2024-06-24 18:24:19 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-24 18:24:19 (GMT) |
commit | 9769b7ae064a0546a98cbcbec2561dbaba20cd23 (patch) | |
tree | 1b953e866faca7527099a68daf362e29501a7680 /Parser | |
parent | 447e07ab3d569bb4b2209ccfe3889fafa3ad6693 (diff) | |
download | cpython-9769b7ae064a0546a98cbcbec2561dbaba20cd23.zip cpython-9769b7ae064a0546a98cbcbec2561dbaba20cd23.tar.gz cpython-9769b7ae064a0546a98cbcbec2561dbaba20cd23.tar.bz2 |
[3.13] gh-113993: Allow interned strings to be mortal, and fix related issues (GH-120520) (GH-120945)
* Add an InternalDocs file describing how interning should work and how to use it.
* Add internal functions to *explicitly* request what kind of interning is done:
- `_PyUnicode_InternMortal`
- `_PyUnicode_InternImmortal`
- `_PyUnicode_InternStatic`
* Switch uses of `PyUnicode_InternInPlace` to those.
* Disallow using `_Py_SetImmortal` on strings directly.
You should use `_PyUnicode_InternImmortal` instead:
- Strings should be interned before immortalization, otherwise you're possibly
interning a immortalizing copy.
- `_Py_SetImmortal` doesn't handle the `SSTATE_INTERNED_MORTAL` to
`SSTATE_INTERNED_IMMORTAL` update, and those flags can't be changed in
backports, as they are now part of public API and version-specific ABI.
* Add private `_only_immortal` argument for `sys.getunicodeinternedsize`, used in refleak test machinery.
* Make sure the statically allocated string singletons are unique. This means these sets are now disjoint:
- `_Py_ID`
- `_Py_STR` (including the empty string)
- one-character latin-1 singletons
Now, when you intern a singleton, that exact singleton will be interned.
* Add a `_Py_LATIN1_CHR` macro, use it instead of `_Py_ID`/`_Py_STR` for one-character latin-1 singletons everywhere (including Clinic).
* Intern `_Py_STR` singletons at startup.
* For free-threaded builds, intern `_Py_LATIN1_CHR` singletons at startup.
* Beef up the tests. Cover internal details (marked with `@cpython_only`).
* Add lots of assertions
Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
Diffstat (limited to 'Parser')
-rw-r--r-- | Parser/action_helpers.c | 4 | ||||
-rw-r--r-- | Parser/pegen.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Parser/action_helpers.c b/Parser/action_helpers.c index 3f6c282..6353bac 100644 --- a/Parser/action_helpers.c +++ b/Parser/action_helpers.c @@ -3,6 +3,7 @@ #include "pegen.h" #include "string_parser.h" #include "pycore_runtime.h" // _PyRuntime +#include "pycore_pystate.h" // _PyInterpreterState_GET() void * _PyPegen_dummy_name(Parser *p, ...) @@ -123,7 +124,8 @@ _PyPegen_join_names_with_dot(Parser *p, expr_ty first_name, expr_ty second_name) if (!uni) { return NULL; } - PyUnicode_InternInPlace(&uni); + PyInterpreterState *interp = _PyInterpreterState_GET(); + _PyUnicode_InternImmortal(interp, &uni); if (_PyArena_AddPyObject(p->arena, uni) < 0) { Py_DECREF(uni); return NULL; diff --git a/Parser/pegen.c b/Parser/pegen.c index 009e5ba..6efb547 100644 --- a/Parser/pegen.c +++ b/Parser/pegen.c @@ -528,7 +528,8 @@ _PyPegen_new_identifier(Parser *p, const char *n) } id = id2; } - PyUnicode_InternInPlace(&id); + PyInterpreterState *interp = _PyInterpreterState_GET(); + _PyUnicode_InternImmortal(interp, &id); if (_PyArena_AddPyObject(p->arena, id) < 0) { Py_DECREF(id); |