mirror of
https://github.com/python/cpython.git
synced 2025-08-23 18:24:46 +00:00
[3.12] gh-113993: Make interned strings mortal (GH-120520, GH-121364, GH-121903, GH-122303) (#123065)
This backports several PRs for gh-113993, making interned strings mortal so they can be garbage-collected when no longer needed. * 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. * Beef up the tests. Cover internal details (marked with `@cpython_only`). * Add lots of assertions * Don't immortalize in PyUnicode_InternInPlace; keep immortalizing in other API (GH-121364) * Switch PyUnicode_InternInPlace to _PyUnicode_InternMortal, clarify docs * Document immortality in some functions that take `const char *` This is PyUnicode_InternFromString; PyDict_SetItemString, PyObject_SetAttrString; PyObject_DelAttrString; PyUnicode_InternFromString; and the PyModule_Add convenience functions. Always point out a non-immortalizing alternative. * Don't immortalize user-provided attr names in _ctypes * Immortalize names in code objects to avoid crash (GH-121903) * Intern latin-1 one-byte strings at startup (GH-122303) There are some 3.12-specific changes, mainly to allow statically allocated strings in deepfreeze. (In 3.13, deepfreeze switched to the general `_Py_ID`/`_Py_STR`.) Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
This commit is contained in:
parent
2fa9ca5070
commit
49f6beb56a
51 changed files with 26040 additions and 27615 deletions
|
@ -275,10 +275,9 @@ parse_literal(PyObject *fmt, Py_ssize_t *ppos, PyArena *arena)
|
|||
PyObject *str = PyUnicode_Substring(fmt, start, pos);
|
||||
/* str = str.replace('%%', '%') */
|
||||
if (str && has_percents) {
|
||||
_Py_DECLARE_STR(percent, "%");
|
||||
_Py_DECLARE_STR(dbl_percent, "%%");
|
||||
Py_SETREF(str, PyUnicode_Replace(str, &_Py_STR(dbl_percent),
|
||||
&_Py_STR(percent), -1));
|
||||
_Py_LATIN1_CHR('%'), -1));
|
||||
}
|
||||
if (!str) {
|
||||
return NULL;
|
||||
|
|
|
@ -10,9 +10,7 @@
|
|||
* See ast.unparse for a full unparser (written in Python)
|
||||
*/
|
||||
|
||||
_Py_DECLARE_STR(open_br, "{");
|
||||
_Py_DECLARE_STR(dbl_open_br, "{{");
|
||||
_Py_DECLARE_STR(close_br, "}");
|
||||
_Py_DECLARE_STR(dbl_close_br, "}}");
|
||||
|
||||
/* We would statically initialize this if doing so were simple enough. */
|
||||
|
@ -580,11 +578,13 @@ escape_braces(PyObject *orig)
|
|||
{
|
||||
PyObject *temp;
|
||||
PyObject *result;
|
||||
temp = PyUnicode_Replace(orig, &_Py_STR(open_br), &_Py_STR(dbl_open_br), -1);
|
||||
temp = PyUnicode_Replace(orig, _Py_LATIN1_CHR('{'),
|
||||
&_Py_STR(dbl_open_br), -1);
|
||||
if (!temp) {
|
||||
return NULL;
|
||||
}
|
||||
result = PyUnicode_Replace(temp, &_Py_STR(close_br), &_Py_STR(dbl_close_br), -1);
|
||||
result = PyUnicode_Replace(temp, _Py_LATIN1_CHR('}'),
|
||||
&_Py_STR(dbl_close_br), -1);
|
||||
Py_DECREF(temp);
|
||||
return result;
|
||||
}
|
||||
|
@ -678,7 +678,7 @@ append_formattedvalue(_PyUnicodeWriter *writer, expr_ty e)
|
|||
if (!temp_fv_str) {
|
||||
return -1;
|
||||
}
|
||||
if (PyUnicode_Find(temp_fv_str, &_Py_STR(open_br), 0, 1, 1) == 0) {
|
||||
if (PyUnicode_Find(temp_fv_str, _Py_LATIN1_CHR('{'), 0, 1, 1) == 0) {
|
||||
/* Expression starts with a brace, split it with a space from the outer
|
||||
one. */
|
||||
outer_brace = "{ ";
|
||||
|
|
52
Python/clinic/sysmodule.c.h
generated
52
Python/clinic/sysmodule.c.h
generated
|
@ -913,24 +913,64 @@ exit:
|
|||
}
|
||||
|
||||
PyDoc_STRVAR(sys_getunicodeinternedsize__doc__,
|
||||
"getunicodeinternedsize($module, /)\n"
|
||||
"getunicodeinternedsize($module, /, *, _only_immortal=False)\n"
|
||||
"--\n"
|
||||
"\n"
|
||||
"Return the number of elements of the unicode interned dictionary");
|
||||
|
||||
#define SYS_GETUNICODEINTERNEDSIZE_METHODDEF \
|
||||
{"getunicodeinternedsize", (PyCFunction)sys_getunicodeinternedsize, METH_NOARGS, sys_getunicodeinternedsize__doc__},
|
||||
{"getunicodeinternedsize", _PyCFunction_CAST(sys_getunicodeinternedsize), METH_FASTCALL|METH_KEYWORDS, sys_getunicodeinternedsize__doc__},
|
||||
|
||||
static Py_ssize_t
|
||||
sys_getunicodeinternedsize_impl(PyObject *module);
|
||||
sys_getunicodeinternedsize_impl(PyObject *module, int _only_immortal);
|
||||
|
||||
static PyObject *
|
||||
sys_getunicodeinternedsize(PyObject *module, PyObject *Py_UNUSED(ignored))
|
||||
sys_getunicodeinternedsize(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
|
||||
{
|
||||
PyObject *return_value = NULL;
|
||||
#if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
|
||||
|
||||
#define NUM_KEYWORDS 1
|
||||
static struct {
|
||||
PyGC_Head _this_is_not_used;
|
||||
PyObject_VAR_HEAD
|
||||
PyObject *ob_item[NUM_KEYWORDS];
|
||||
} _kwtuple = {
|
||||
.ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS)
|
||||
.ob_item = { &_Py_ID(_only_immortal), },
|
||||
};
|
||||
#undef NUM_KEYWORDS
|
||||
#define KWTUPLE (&_kwtuple.ob_base.ob_base)
|
||||
|
||||
#else // !Py_BUILD_CORE
|
||||
# define KWTUPLE NULL
|
||||
#endif // !Py_BUILD_CORE
|
||||
|
||||
static const char * const _keywords[] = {"_only_immortal", NULL};
|
||||
static _PyArg_Parser _parser = {
|
||||
.keywords = _keywords,
|
||||
.fname = "getunicodeinternedsize",
|
||||
.kwtuple = KWTUPLE,
|
||||
};
|
||||
#undef KWTUPLE
|
||||
PyObject *argsbuf[1];
|
||||
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 0;
|
||||
int _only_immortal = 0;
|
||||
Py_ssize_t _return_value;
|
||||
|
||||
_return_value = sys_getunicodeinternedsize_impl(module);
|
||||
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 0, 0, 0, argsbuf);
|
||||
if (!args) {
|
||||
goto exit;
|
||||
}
|
||||
if (!noptargs) {
|
||||
goto skip_optional_kwonly;
|
||||
}
|
||||
_only_immortal = PyObject_IsTrue(args[0]);
|
||||
if (_only_immortal < 0) {
|
||||
goto exit;
|
||||
}
|
||||
skip_optional_kwonly:
|
||||
_return_value = sys_getunicodeinternedsize_impl(module, _only_immortal);
|
||||
if ((_return_value == -1) && PyErr_Occurred()) {
|
||||
goto exit;
|
||||
}
|
||||
|
@ -1415,4 +1455,4 @@ exit:
|
|||
#ifndef SYS_GETANDROIDAPILEVEL_METHODDEF
|
||||
#define SYS_GETANDROIDAPILEVEL_METHODDEF
|
||||
#endif /* !defined(SYS_GETANDROIDAPILEVEL_METHODDEF) */
|
||||
/*[clinic end generated code: output=6d598acc26237fbe input=a9049054013a1b77]*/
|
||||
/*[clinic end generated code: output=2a1fbdf7de450c63 input=a9049054013a1b77]*/
|
||||
|
|
|
@ -144,7 +144,9 @@ PyObject *_PyCodec_Lookup(const char *encoding)
|
|||
if (v == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
PyUnicode_InternInPlace(&v);
|
||||
|
||||
/* Intern the string. We'll make it immortal later if lookup succeeds. */
|
||||
_PyUnicode_InternMortal(interp, &v);
|
||||
|
||||
/* First, try to lookup the name in the registry dictionary */
|
||||
PyObject *result = PyDict_GetItemWithError(interp->codec_search_cache, v);
|
||||
|
@ -197,6 +199,8 @@ PyObject *_PyCodec_Lookup(const char *encoding)
|
|||
goto onError;
|
||||
}
|
||||
|
||||
_PyUnicode_InternImmortal(interp, &v);
|
||||
|
||||
/* Cache and return the result */
|
||||
if (PyDict_SetItem(interp->codec_search_cache, v, result) < 0) {
|
||||
Py_DECREF(result);
|
||||
|
|
|
@ -773,8 +773,7 @@ compiler_set_qualname(struct compiler *c)
|
|||
}
|
||||
|
||||
if (base != NULL) {
|
||||
_Py_DECLARE_STR(dot, ".");
|
||||
name = PyUnicode_Concat(base, &_Py_STR(dot));
|
||||
name = PyUnicode_Concat(base, _Py_LATIN1_CHR('.'));
|
||||
Py_DECREF(base);
|
||||
if (name == NULL) {
|
||||
return ERROR;
|
||||
|
|
|
@ -1964,7 +1964,8 @@ new_kwtuple(const char * const *keywords, int total, int pos)
|
|||
Py_DECREF(kwtuple);
|
||||
return NULL;
|
||||
}
|
||||
PyUnicode_InternInPlace(&str);
|
||||
PyInterpreterState *interp = _PyInterpreterState_GET();
|
||||
_PyUnicode_InternImmortal(interp, &str);
|
||||
PyTuple_SET_ITEM(kwtuple, i, str);
|
||||
}
|
||||
return kwtuple;
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
#include "pycore_long.h" // _PyLong_DigitCount
|
||||
#include "pycore_hashtable.h" // _Py_hashtable_t
|
||||
#include "marshal.h" // Py_MARSHAL_VERSION
|
||||
#include "pycore_pystate.h" // _PyInterpreterState_GET()
|
||||
|
||||
/*[clinic input]
|
||||
module marshal
|
||||
|
@ -1158,8 +1159,12 @@ r_object(RFILE *p)
|
|||
v = PyUnicode_FromKindAndData(PyUnicode_1BYTE_KIND, ptr, n);
|
||||
if (v == NULL)
|
||||
break;
|
||||
if (is_interned)
|
||||
PyUnicode_InternInPlace(&v);
|
||||
if (is_interned) {
|
||||
// marshal is meant to serialize .pyc files with code
|
||||
// objects, and code-related strings are currently immortal.
|
||||
PyInterpreterState *interp = _PyInterpreterState_GET();
|
||||
_PyUnicode_InternImmortal(interp, &v);
|
||||
}
|
||||
retval = v;
|
||||
R_REF(retval);
|
||||
break;
|
||||
|
@ -1191,8 +1196,12 @@ r_object(RFILE *p)
|
|||
}
|
||||
if (v == NULL)
|
||||
break;
|
||||
if (is_interned)
|
||||
PyUnicode_InternInPlace(&v);
|
||||
if (is_interned) {
|
||||
// marshal is meant to serialize .pyc files with code
|
||||
// objects, and code-related strings are currently immortal.
|
||||
PyInterpreterState *interp = _PyInterpreterState_GET();
|
||||
_PyUnicode_InternImmortal(interp, &v);
|
||||
}
|
||||
retval = v;
|
||||
R_REF(retval);
|
||||
break;
|
||||
|
|
|
@ -839,6 +839,13 @@ pycore_interp_init(PyThreadState *tstate)
|
|||
return _PyStatus_ERR("failed to initialize deep-frozen modules");
|
||||
}
|
||||
|
||||
// Per-interpreter interned string dict is created after deep-frozen
|
||||
// modules have interned the global strings.
|
||||
status = _PyUnicode_InitInternDict(interp);
|
||||
if (_PyStatus_EXCEPTION(status)) {
|
||||
return status;
|
||||
}
|
||||
|
||||
status = pycore_init_types(interp);
|
||||
if (_PyStatus_EXCEPTION(status)) {
|
||||
goto done;
|
||||
|
|
|
@ -722,7 +722,7 @@ sys_displayhook(PyObject *module, PyObject *o)
|
|||
if (o == Py_None) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
if (PyObject_SetAttr(builtins, &_Py_ID(_), Py_None) != 0)
|
||||
if (PyObject_SetAttr(builtins, _Py_LATIN1_CHR('_'), Py_None) != 0)
|
||||
return NULL;
|
||||
outf = _PySys_GetAttr(tstate, &_Py_ID(stdout));
|
||||
if (outf == NULL || outf == Py_None) {
|
||||
|
@ -744,10 +744,9 @@ sys_displayhook(PyObject *module, PyObject *o)
|
|||
return NULL;
|
||||
}
|
||||
}
|
||||
_Py_DECLARE_STR(newline, "\n");
|
||||
if (PyFile_WriteObject(&_Py_STR(newline), outf, Py_PRINT_RAW) != 0)
|
||||
if (PyFile_WriteObject(_Py_LATIN1_CHR('\n'), outf, Py_PRINT_RAW) != 0)
|
||||
return NULL;
|
||||
if (PyObject_SetAttr(builtins, &_Py_ID(_), o) != 0)
|
||||
if (PyObject_SetAttr(builtins, _Py_LATIN1_CHR('_'), o) != 0)
|
||||
return NULL;
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
@ -927,8 +926,9 @@ sys_intern_impl(PyObject *module, PyObject *s)
|
|||
/*[clinic end generated code: output=be680c24f5c9e5d6 input=849483c006924e2f]*/
|
||||
{
|
||||
if (PyUnicode_CheckExact(s)) {
|
||||
PyInterpreterState *interp = _PyInterpreterState_GET();
|
||||
Py_INCREF(s);
|
||||
PyUnicode_InternInPlace(&s);
|
||||
_PyUnicode_InternMortal(interp, &s);
|
||||
return s;
|
||||
}
|
||||
else {
|
||||
|
@ -1918,14 +1918,22 @@ sys_getallocatedblocks_impl(PyObject *module)
|
|||
/*[clinic input]
|
||||
sys.getunicodeinternedsize -> Py_ssize_t
|
||||
|
||||
*
|
||||
_only_immortal: bool = False
|
||||
|
||||
Return the number of elements of the unicode interned dictionary
|
||||
[clinic start generated code]*/
|
||||
|
||||
static Py_ssize_t
|
||||
sys_getunicodeinternedsize_impl(PyObject *module)
|
||||
/*[clinic end generated code: output=ad0e4c9738ed4129 input=726298eaa063347a]*/
|
||||
sys_getunicodeinternedsize_impl(PyObject *module, int _only_immortal)
|
||||
/*[clinic end generated code: output=29a6377a94a14f70 input=0330b3408dd5bcc6]*/
|
||||
{
|
||||
return _PyUnicode_InternedSize();
|
||||
if (_only_immortal) {
|
||||
return _PyUnicode_InternedSize_Immortal();
|
||||
}
|
||||
else {
|
||||
return _PyUnicode_InternedSize();
|
||||
}
|
||||
}
|
||||
|
||||
/*[clinic input]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue