mirror of
https://github.com/python/cpython.git
synced 2025-10-17 04:08:28 +00:00
gh-113993: Allow interned strings to be mortal, and fix related issues (GH-120520)
* 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>
This commit is contained in:
parent
7595e6743a
commit
6f1d448bc1
42 changed files with 2464 additions and 1140 deletions
|
@ -370,9 +370,14 @@ def generate_static_strings_initializer(identifiers, strings):
|
|||
# This use of _Py_ID() is ignored by iter_global_strings()
|
||||
# since iter_files() ignores .h files.
|
||||
printer.write(f'string = &_Py_ID({i});')
|
||||
printer.write(f'_PyUnicode_InternStatic(interp, &string);')
|
||||
printer.write(f'assert(_PyUnicode_CheckConsistency(string, 1));')
|
||||
printer.write(f'_PyUnicode_InternInPlace(interp, &string);')
|
||||
# XXX What about "strings"?
|
||||
printer.write(f'assert(PyUnicode_GET_LENGTH(string) != 1);')
|
||||
for value, name in sorted(strings.items()):
|
||||
printer.write(f'string = &_Py_STR({name});')
|
||||
printer.write(f'_PyUnicode_InternStatic(interp, &string);')
|
||||
printer.write(f'assert(_PyUnicode_CheckConsistency(string, 1));')
|
||||
printer.write(f'assert(PyUnicode_GET_LENGTH(string) != 1);')
|
||||
printer.write(END)
|
||||
printer.write(after)
|
||||
|
||||
|
@ -414,15 +419,31 @@ def generate_global_object_finalizers(generated_immortal_objects):
|
|||
def get_identifiers_and_strings() -> 'tuple[set[str], dict[str, str]]':
|
||||
identifiers = set(IDENTIFIERS)
|
||||
strings = {}
|
||||
# Note that we store strings as they appear in C source, so the checks here
|
||||
# can be defeated, e.g.:
|
||||
# - "a" and "\0x61" won't be reported as duplicate.
|
||||
# - "\n" appears as 2 characters.
|
||||
# Probably not worth adding a C string parser.
|
||||
for name, string, *_ in iter_global_strings():
|
||||
if string is None:
|
||||
if name not in IGNORED:
|
||||
identifiers.add(name)
|
||||
else:
|
||||
if len(string) == 1 and ord(string) < 256:
|
||||
# Give a nice message for common mistakes.
|
||||
# To cover tricky cases (like "\n") we also generate C asserts.
|
||||
raise ValueError(
|
||||
'do not use &_PyID or &_Py_STR for one-character latin-1 '
|
||||
+ f'strings, use _Py_LATIN1_CHR instead: {string!r}')
|
||||
if string not in strings:
|
||||
strings[string] = name
|
||||
elif name != strings[string]:
|
||||
raise ValueError(f'string mismatch for {name!r} ({string!r} != {strings[name]!r}')
|
||||
overlap = identifiers & set(strings.keys())
|
||||
if overlap:
|
||||
raise ValueError(
|
||||
'do not use both _PyID and _Py_DECLARE_STR for the same string: '
|
||||
+ repr(overlap))
|
||||
return identifiers, strings
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue