Skip to content

gh-100227: Move the Dict of Interned Strings to PyInterpreterState #102339

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 7 commits into from
Mar 28, 2023
Merged

gh-100227: Move the Dict of Interned Strings to PyInterpreterState #102339

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fa1d9a0
set_interned_dict() -> ensure_interned_dict().
ericsnowcurrently Feb 28, 2023
23e2211
Move the interned dict to PyInterpreterState.
ericsnowcurrently Feb 28, 2023
969caba
Intern the static strings for every interpreter.
ericsnowcurrently Feb 28, 2023
2e8773b
Revert "gh-100227: Make the Global Interned Dict Safe for Isolated In…
ericsnowcurrently Mar 27, 2023
408ee56
Fix unicode_is_finalizing().
ericsnowcurrently Mar 27, 2023
4d4fdb1
Merge branch 'revert-global-interned-fixes' into isolate-interned-dict
ericsnowcurrently Mar 27, 2023
e53ac85
Merge branch 'main' into isolate-interned-dict
ericsnowcurrently Mar 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
Next Next commit
set_interned_dict() -> ensure_interned_dict().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Feb 28, 2023
commit fa1d9a080fa5f305242339f1b09b9e9a71ab9f54
41 changes: 28 additions & 13 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,29 @@ static inline PyObject *get_interned_dict(void)
return _Py_CACHED_OBJECT(interned_strings);
}

static inline void set_interned_dict(PyObject *dict)
static PyObject *
ensure_interned_dict()
{
_Py_CACHED_OBJECT(interned_strings) = dict;
PyObject *interned = get_interned_dict();
if (interned == NULL) {
interned = PyDict_New();
if (interned == NULL) {
return NULL;
}
_Py_CACHED_OBJECT(interned_strings) = interned;
}
return interned;
}

static void
clear_interned_dict(void)
{
PyObject *interned = get_interned_dict();
if (interned != NULL) {
PyDict_Clear(interned);
Py_DECREF(interned);
_Py_CACHED_OBJECT(interned_strings) = NULL;
}
}

#define _Py_RETURN_UNICODE_EMPTY() \
Expand Down Expand Up @@ -1528,7 +1548,6 @@ unicode_dealloc(PyObject *unicode)
_Py_FatalRefcountError("deallocating an Unicode singleton");
}
#endif
PyObject *interned = get_interned_dict();
if (PyUnicode_CHECK_INTERNED(unicode)) {
/* Revive the dead object temporarily. PyDict_DelItem() removes two
references (key and value) which were ignored by
Expand All @@ -1537,6 +1556,8 @@ unicode_dealloc(PyObject *unicode)
PyDict_DelItem(). */
assert(Py_REFCNT(unicode) == 0);
Py_SET_REFCNT(unicode, 3);
PyObject *interned = get_interned_dict();
assert(interned != NULL);
if (PyDict_DelItem(interned, unicode) != 0) {
_PyErr_WriteUnraisableMsg("deletion of interned string failed",
NULL);
Expand Down Expand Up @@ -14602,14 +14623,10 @@ PyUnicode_InternInPlace(PyObject **p)
return;
}

PyObject *interned = get_interned_dict();
PyObject *interned = ensure_interned_dict();
if (interned == NULL) {
interned = PyDict_New();
if (interned == NULL) {
PyErr_Clear(); /* Don't leave an exception */
return;
}
set_interned_dict(interned);
PyErr_Clear(); /* Don't leave an exception */
return;
}

PyObject *t = PyDict_SetDefault(interned, s, s);
Expand Down Expand Up @@ -14694,9 +14711,7 @@ _PyUnicode_ClearInterned(PyInterpreterState *interp)
total_length);
#endif

PyDict_Clear(interned);
Py_DECREF(interned);
set_interned_dict(NULL);
clear_interned_dict();
}


Expand Down