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

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
generate_global_objects.py: Fix name of macro in error message (#124464) 
_PyID does not exist but _Py_ID does.
  • Loading branch information
@JelleZijlstra @encukou
JelleZijlstra authored and encukou committed Sep 27, 2024
commit 50e14929999fb7c49ed0c0a0b7b3c1e9d1e39f81
4 changes: 2 additions & 2 deletions Tools/build/generate_global_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ def get_identifiers_and_strings() -> 'tuple[set[str], dict[str, str]]':
# 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 '
'do not use &_Py_ID 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
Expand All @@ -434,7 +434,7 @@ def get_identifiers_and_strings() -> 'tuple[set[str], dict[str, str]]':
overlap = identifiers & set(strings.keys())
if overlap:
raise ValueError(
'do not use both _PyID and _Py_DECLARE_STR for the same string: '
'do not use both _Py_ID and _Py_DECLARE_STR for the same string: '
+ repr(overlap))
return identifiers, strings

Expand Down