Skip to content

gh-103571: Add runtime-global strings to the initial per-interpreter interned_dict #103572

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

Closed
Christopher-Chianelli wants to merge 2 commits into from
Closed

gh-103571: Add runtime-global strings to the initial per-interpreter interned_dict #103572

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9375108
gh-103571: Add runtime-global strings to the initial per-interpreter …
Christopher-Chianelli Apr 16, 2023
7d06a7e
Modify singleton object interning to not use intern dict
Christopher-Chianelli Apr 16, 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
37 changes: 35 additions & 2 deletions Objects/codeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
#include "pycore_tuple.h" // _PyTuple_ITEMS()
#include "clinic/codeobject.c.h"

#define LATIN1(ch) \
(ch < 128 \
? (PyObject*)&_Py_SINGLETON(strings).ascii[ch] \
: (PyObject*)&_Py_SINGLETON(strings).latin1[ch - 128])

static PyObject* code_repr(PyCodeObject *co);

static const char *
Expand Down Expand Up @@ -111,6 +116,15 @@ PyCode_ClearWatcher(int watcher_id)
* generic helpers
******************/

/* is_runtime_global_string(s): true iff s is a runtime global (singleton ascii strings) */
static int
is_runtime_global_string(PyObject *o) {
if (!PyUnicode_IS_ASCII(o))
return 0;

return PyUnicode_GET_LENGTH(o) == 1;
}

/* all_name_chars(s): true iff s matches [a-zA-Z0-9_]* */
static int
all_name_chars(PyObject *o)
Expand Down Expand Up @@ -156,8 +170,27 @@ intern_string_constants(PyObject *tuple, int *modified)
if (PyUnicode_READY(v) == -1) {
return -1;
}

if (all_name_chars(v)) {
if (is_runtime_global_string(v)) {
// unfortunately, storing the immortal singletons
// in the interned string dict seem to cause some
// refcount issues
const void *data;
int kind;
Py_UCS4 ch;

kind = PyUnicode_KIND(v);
data = PyUnicode_DATA(v);
ch = PyUnicode_READ(kind, data, 0);
PyObject *w = LATIN1(ch);
if (w != v) {
PyTuple_SET_ITEM(tuple, i, w);
Py_INCREF(w);
if (modified) {
*modified = 1;
}
}
}
else if (all_name_chars(v)) {
PyObject *w = v;
PyUnicode_InternInPlace(&v);
if (w != v) {
Expand Down