Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-100227: Move _str_replace_inf to PyInterpreterState (gh-102333) 

https://github.com/python/cpython/issues/100227
This commit is contained in:
Eric Snow 2023-02-28 14:16:39 -07:00 committed by GitHub
parent f300a1fa4c
commit 880437d4ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Include/internal/pycore_global_objects.h
View File

@ -27,8 +27,6 @@ extern "C" {
_PyRuntime.cached_objects.NAME _PyRuntime.cached_objects.NAME
struct _Py_cached_objects { struct _Py_cached_objects {
PyObject *str_replace_inf;
PyObject *interned_strings; PyObject *interned_strings;
}; };
@ -67,11 +65,14 @@ struct _Py_static_objects {
(interp)->cached_objects.NAME (interp)->cached_objects.NAME
struct _Py_interp_cached_objects { struct _Py_interp_cached_objects {
int _not_set; /* AST */
PyObject *str_replace_inf;
/* object.__reduce__ */ /* object.__reduce__ */
PyObject *objreduce; PyObject *objreduce;
PyObject *type_slots_pname; PyObject *type_slots_pname;
pytype_slotdef *type_slots_ptrs[MAX_EQUIV]; pytype_slotdef *type_slots_ptrs[MAX_EQUIV];
}; };
#define _Py_INTERP_STATIC_OBJECT(interp, NAME) \ #define _Py_INTERP_STATIC_OBJECT(interp, NAME) \

4
Parser/asdl_c.py
View File

@ -1484,9 +1484,7 @@ 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("""
if (_PyInterpreterState_Get() == _PyInterpreterState_Main()) { Py_CLEAR(_Py_INTERP_CACHED_OBJECT(interp, str_replace_inf));
Py_CLEAR(_Py_CACHED_OBJECT(str_replace_inf));
}
#if !defined(NDEBUG) #if !defined(NDEBUG)
state->initialized = -1; state->initialized = -1;

4
Python/Python-ast.c generated
View File

@ -263,9 +263,7 @@ void _PyAST_Fini(PyInterpreterState *interp)
Py_CLEAR(state->vararg); Py_CLEAR(state->vararg);
Py_CLEAR(state->withitem_type); Py_CLEAR(state->withitem_type);
if (_PyInterpreterState_Get() == _PyInterpreterState_Main()) { Py_CLEAR(_Py_INTERP_CACHED_OBJECT(interp, str_replace_inf));
Py_CLEAR(_Py_CACHED_OBJECT(str_replace_inf));
}
#if !defined(NDEBUG) #if !defined(NDEBUG)
state->initialized = -1; state->initialized = -1;

19
Python/ast_unparse.c
View File

@ -1,5 +1,6 @@
#include "Python.h" #include "Python.h"
#include "pycore_ast.h" // expr_ty #include "pycore_ast.h" // expr_ty
#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 <float.h> // DBL_MAX_10_EXP
#include <stdbool.h> #include <stdbool.h>
@ -13,7 +14,10 @@ _Py_DECLARE_STR(open_br, "{");
_Py_DECLARE_STR(dbl_open_br, "{{"); _Py_DECLARE_STR(dbl_open_br, "{{");
_Py_DECLARE_STR(close_br, "}"); _Py_DECLARE_STR(close_br, "}");
_Py_DECLARE_STR(dbl_close_br, "}}"); _Py_DECLARE_STR(dbl_close_br, "}}");
#define _str_replace_inf _Py_CACHED_OBJECT(str_replace_inf)
/* 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 *
@ -78,10 +82,11 @@ 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();
PyObject *new_repr = PyUnicode_Replace( PyObject *new_repr = PyUnicode_Replace(
repr, repr,
&_Py_ID(inf), &_Py_ID(inf),
_str_replace_inf, _str_replace_inf(interp),
-1 -1
); );
Py_DECREF(repr); Py_DECREF(repr);
@ -916,9 +921,13 @@ append_ast_expr(_PyUnicodeWriter *writer, expr_ty e, int level)
static int static int
maybe_init_static_strings(void) maybe_init_static_strings(void)
{ {
if (!_str_replace_inf && PyInterpreterState *interp = _PyInterpreterState_GET();
!(_str_replace_inf = PyUnicode_FromFormat("1e%d", 1 + DBL_MAX_10_EXP))) { if (_str_replace_inf(interp) == NULL) {
return -1; PyObject *tmp = PyUnicode_FromFormat("1e%d", 1 + DBL_MAX_10_EXP);
if (tmp == NULL) {
return -1;
}
_str_replace_inf(interp) = tmp;
} }
return 0; return 0;
} }