[3.13] gh-125268: Use static string for "1e309" in AST (GH-125272) (GH-125280)

When formatting the AST as a string, infinite values are replaced by
1e309, which evaluates to infinity. The initialization of this string
replacement was not thread-safe in the free threading build.
(cherry picked from commit 427dcf24de)
This commit is contained in:
Sam Gross 2024-10-24 13:59:23 -04:00 committed by GitHub
parent f27ba61e56
commit 4b55d53316
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 4813 additions and 4820 deletions

File diff suppressed because it is too large Load Diff

View File

@ -67,7 +67,7 @@ struct _Py_interp_cached_objects {
PyObject *interned_strings; PyObject *interned_strings;
/* AST */ /* AST */
PyObject *str_replace_inf; PyObject *_unused_str_replace_inf; // kept in 3.13 for ABI compatibility
/* object.__reduce__ */ /* object.__reduce__ */
PyObject *objreduce; PyObject *objreduce;

View File

@ -561,6 +561,7 @@ _PyStaticObjects_CheckRefcnt(PyInterpreterState *interp) {
_PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(json_decoder)); _PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(json_decoder));
_PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(kwdefaults)); _PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(kwdefaults));
_PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(list_err)); _PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(list_err));
_PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(str_replace_inf));
_PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(type_params)); _PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(type_params));
_PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(utf_8)); _PyStaticObject_CheckRefcnt((PyObject *)&_Py_STR(utf_8));
_PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(CANCELLED)); _PyStaticObject_CheckRefcnt((PyObject *)&_Py_ID(CANCELLED));

View File

@ -47,6 +47,7 @@ struct _Py_global_strings {
STRUCT_FOR_STR(json_decoder, "json.decoder") STRUCT_FOR_STR(json_decoder, "json.decoder")
STRUCT_FOR_STR(kwdefaults, ".kwdefaults") STRUCT_FOR_STR(kwdefaults, ".kwdefaults")
STRUCT_FOR_STR(list_err, "list index out of range") STRUCT_FOR_STR(list_err, "list index out of range")
STRUCT_FOR_STR(str_replace_inf, "1e309")
STRUCT_FOR_STR(type_params, ".type_params") STRUCT_FOR_STR(type_params, ".type_params")
STRUCT_FOR_STR(utf_8, "utf-8") STRUCT_FOR_STR(utf_8, "utf-8")
} literals; } literals;

View File

@ -556,6 +556,7 @@ extern "C" {
INIT_STR(json_decoder, "json.decoder"), \ INIT_STR(json_decoder, "json.decoder"), \
INIT_STR(kwdefaults, ".kwdefaults"), \ INIT_STR(kwdefaults, ".kwdefaults"), \
INIT_STR(list_err, "list index out of range"), \ INIT_STR(list_err, "list index out of range"), \
INIT_STR(str_replace_inf, "1e309"), \
INIT_STR(type_params, ".type_params"), \ INIT_STR(type_params, ".type_params"), \
INIT_STR(utf_8, "utf-8"), \ INIT_STR(utf_8, "utf-8"), \
} }

View File

@ -2912,6 +2912,10 @@ _PyUnicode_InitStaticStrings(PyInterpreterState *interp) {
_PyUnicode_InternStatic(interp, &string); _PyUnicode_InternStatic(interp, &string);
assert(_PyUnicode_CheckConsistency(string, 1)); assert(_PyUnicode_CheckConsistency(string, 1));
assert(PyUnicode_GET_LENGTH(string) != 1); assert(PyUnicode_GET_LENGTH(string) != 1);
string = &_Py_STR(str_replace_inf);
_PyUnicode_InternStatic(interp, &string);
assert(_PyUnicode_CheckConsistency(string, 1));
assert(PyUnicode_GET_LENGTH(string) != 1);
string = &_Py_STR(anon_null); string = &_Py_STR(anon_null);
_PyUnicode_InternStatic(interp, &string); _PyUnicode_InternStatic(interp, &string);
assert(_PyUnicode_CheckConsistency(string, 1)); assert(_PyUnicode_CheckConsistency(string, 1));

View File

@ -1740,8 +1740,6 @@ def generate_ast_fini(module_state, f):
for s in module_state: for s in module_state:
f.write(" Py_CLEAR(state->" + s + ');\n') f.write(" Py_CLEAR(state->" + s + ');\n')
f.write(textwrap.dedent(""" f.write(textwrap.dedent("""
Py_CLEAR(_Py_INTERP_CACHED_OBJECT(interp, str_replace_inf));
state->finalized = 1; state->finalized = 1;
state->once = (_PyOnceFlag){0}; state->once = (_PyOnceFlag){0};
} }

2
Python/Python-ast.c generated
View File

@ -279,8 +279,6 @@ void _PyAST_Fini(PyInterpreterState *interp)
Py_CLEAR(state->vararg); Py_CLEAR(state->vararg);
Py_CLEAR(state->withitem_type); Py_CLEAR(state->withitem_type);
Py_CLEAR(_Py_INTERP_CACHED_OBJECT(interp, str_replace_inf));
state->finalized = 1; state->finalized = 1;
state->once = (_PyOnceFlag){0}; state->once = (_PyOnceFlag){0};
} }

View File

@ -2,7 +2,6 @@
#include "pycore_ast.h" // expr_ty #include "pycore_ast.h" // expr_ty
#include "pycore_pystate.h" // _PyInterpreterState_GET() #include "pycore_pystate.h" // _PyInterpreterState_GET()
#include "pycore_runtime.h" // _Py_ID() #include "pycore_runtime.h" // _Py_ID()
#include <float.h> // DBL_MAX_10_EXP
#include <stdbool.h> #include <stdbool.h>
/* This limited unparser is used to convert annotations back to strings /* This limited unparser is used to convert annotations back to strings
@ -13,10 +12,6 @@
_Py_DECLARE_STR(dbl_open_br, "{{"); _Py_DECLARE_STR(dbl_open_br, "{{");
_Py_DECLARE_STR(dbl_close_br, "}}"); _Py_DECLARE_STR(dbl_close_br, "}}");
/* We would statically initialize this if doing so were simple enough. */
#define _str_replace_inf(interp) \
_Py_INTERP_CACHED_OBJECT(interp, str_replace_inf)
/* Forward declarations for recursion via helper functions. */ /* Forward declarations for recursion via helper functions. */
static PyObject * static PyObject *
expr_as_unicode(expr_ty e, int level); expr_as_unicode(expr_ty e, int level);
@ -78,13 +73,13 @@ append_repr(_PyUnicodeWriter *writer, PyObject *obj)
} }
if ((PyFloat_CheckExact(obj) && Py_IS_INFINITY(PyFloat_AS_DOUBLE(obj))) || if ((PyFloat_CheckExact(obj) && Py_IS_INFINITY(PyFloat_AS_DOUBLE(obj))) ||
PyComplex_CheckExact(obj)) PyComplex_CheckExact(obj))
{ {
PyInterpreterState *interp = _PyInterpreterState_GET(); _Py_DECLARE_STR(str_replace_inf, "1e309"); // evaluates to inf
PyObject *new_repr = PyUnicode_Replace( PyObject *new_repr = PyUnicode_Replace(
repr, repr,
&_Py_ID(inf), &_Py_ID(inf),
_str_replace_inf(interp), &_Py_STR(str_replace_inf),
-1 -1
); );
Py_DECREF(repr); Py_DECREF(repr);
@ -918,20 +913,6 @@ append_ast_expr(_PyUnicodeWriter *writer, expr_ty e, int level)
return -1; return -1;
} }
static int
maybe_init_static_strings(void)
{
PyInterpreterState *interp = _PyInterpreterState_GET();
if (_str_replace_inf(interp) == NULL) {
PyObject *tmp = PyUnicode_FromFormat("1e%d", 1 + DBL_MAX_10_EXP);
if (tmp == NULL) {
return -1;
}
_str_replace_inf(interp) = tmp;
}
return 0;
}
static PyObject * static PyObject *
expr_as_unicode(expr_ty e, int level) expr_as_unicode(expr_ty e, int level)
{ {
@ -939,9 +920,7 @@ expr_as_unicode(expr_ty e, int level)
_PyUnicodeWriter_Init(&writer); _PyUnicodeWriter_Init(&writer);
writer.min_length = 256; writer.min_length = 256;
writer.overallocate = 1; writer.overallocate = 1;
if (-1 == maybe_init_static_strings() || if (-1 == append_ast_expr(&writer, e, level)) {
-1 == append_ast_expr(&writer, e, level))
{
_PyUnicodeWriter_Dealloc(&writer); _PyUnicodeWriter_Dealloc(&writer);
return NULL; return NULL;
} }