Visitar URL original
gh-106931: Intern Statically Allocated Strings Globally by ericsnowcurrently · Pull Request #107272 · python/cpython · GitHub
Skip to content

gh-106931: Intern Statically Allocated Strings Globally #107272

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
ericsnowcurrently merged 9 commits into from
Jul 27, 2023
Merged

gh-106931: Intern Statically Allocated Strings Globally #107272

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
20d904e
Add PyASCIIObject.state.statically_allocated.
ericsnowcurrently Jul 24, 2023
76f1988
Handle statically allocated strings explicitly when interning.
ericsnowcurrently Jul 25, 2023
2530e4f
Add tests.
ericsnowcurrently Jul 25, 2023
7fbe710
Add _Py_hashtable_len().
ericsnowcurrently Jul 25, 2023
37508a8
Add _PyRuntime.cached_objects.interned_strings.
ericsnowcurrently Jul 25, 2023
1903d30
Intern static str objects to the global hashtable.
ericsnowcurrently Jul 25, 2023
d93fbaf
Add a NEWS entry.
ericsnowcurrently Jul 25, 2023
534f5fd
Use PyDict_GET_SIZE().
ericsnowcurrently Jul 27, 2023
8905116
Use the right allocator.
ericsnowcurrently Jul 27, 2023
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
Handle statically allocated strings explicitly when interning.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Jul 25, 2023
commit 76f198862093682a12950ee81e61fc977332e6e7
12 changes: 11 additions & 1 deletion Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14744,10 +14744,20 @@ _PyUnicode_InternInPlace(PyInterpreterState *interp, PyObject **p)
return;
}

if (_PyUnicode_STATE(s).statically_allocated) {
if (!_Py_IsImmortal(s)) {
printf("\"%s\"\n", PyUnicode_AsUTF8(s));
}
assert(_Py_IsImmortal(s));
_PyUnicode_STATE(*p).interned = SSTATE_INTERNED_IMMORTAL_STATIC;
return;
}
if (_Py_IsImmortal(s)) {
// XXX Restrict this to the main interpreter?
_PyUnicode_STATE(*p).interned = SSTATE_INTERNED_IMMORTAL_STATIC;
return;
return;
}

#ifdef Py_REF_DEBUG
/* The reference count value excluding the 2 references from the
interned dictionary should be excluded from the RefTotal. The
Expand Down