mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-43687: Py_Initialize() creates singletons earlier (GH-25147)

Browse source 
Reorganize pycore_interp_init() to initialize singletons before the
the first PyType_Ready() call. Fix an issue when Python is configured
using --without-doc-strings.
This commit is contained in:
Victor Stinner 2021-04-02 15:28:13 +02:00 • committed by GitHub
parent 58384c6ab0
commit 442ad74fc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 138 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Python/errors.c
View file

@ -1192,7 +1192,7 @@ static PyStructSequence_Desc UnraisableHookArgs_desc = {
PyStatus
_PyErr_Init(void)
_PyErr_InitTypes(void)
{
if (UnraisableHookArgsType.tp_name == NULL) {
if (PyStructSequence_InitType2(&UnraisableHookArgsType,

136
Python/pylifecycle.c
View file

@ -628,38 +628,16 @@ pycore_create_interpreter(_PyRuntimeState *runtime,
static PyStatus
pycore_init_types(PyInterpreterState *interp)
pycore_init_singletons(PyInterpreterState *interp)
{
PyStatus status;
int is_main_interp = _Py_IsMainInterpreter(interp);
status = _PyGC_Init(interp);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
// Create the empty tuple singleton. It must be created before the first
// PyType_Ready() call since PyType_Ready() creates tuples, for tp_bases
// for example.
status = _PyTuple_Init(interp);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
if (is_main_interp) {
status = _PyTypes_Init();
if (_PyStatus_EXCEPTION(status)) {
return status;
}
}
if (!_PyLong_Init(interp)) {
if (_PyLong_Init(interp) < 0) {
return _PyStatus_ERR("can't init longs");
}
status = _PyUnicode_Init(interp);
if (_PyStatus_EXCEPTION(status)) {
return status;
if (_Py_IsMainInterpreter(interp)) {
_PyFloat_Init();
}
status = _PyBytes_Init(interp);
@ -667,22 +645,58 @@ pycore_init_types(PyInterpreterState *interp)
return status;
}
status = _PyUnicode_Init(interp);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
status = _PyTuple_Init(interp);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
return _PyStatus_OK();
}
static PyStatus
pycore_init_types(PyInterpreterState *interp)
{
PyStatus status;
int is_main_interp = _Py_IsMainInterpreter(interp);
if (is_main_interp) {
if (_PyStructSequence_Init() < 0) {
return _PyStatus_ERR("can't initialize structseq");
}
status = _PyTypes_Init();
if (_PyStatus_EXCEPTION(status)) {
return status;
}
if (_PyLong_InitTypes() < 0) {
return _PyStatus_ERR("can't init int type");
}
status = _PyUnicode_InitTypes();
if (_PyStatus_EXCEPTION(status)) {
return status;
}
}
if (is_main_interp) {
if (_PyFloat_InitTypes() < 0) {
return _PyStatus_ERR("can't init float");
}
}
status = _PyExc_Init(interp);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
if (is_main_interp) {
if (!_PyFloat_Init()) {
return _PyStatus_ERR("can't init float");
}
if (_PyStructSequence_Init() < 0) {
return _PyStatus_ERR("can't initialize structseq");
}
}
status = _PyErr_Init();
status = _PyErr_InitTypes();
if (_PyStatus_EXCEPTION(status)) {
return status;
}
@ -693,22 +707,15 @@ pycore_init_types(PyInterpreterState *interp)
}
}
if (_PyWarnings_InitState(interp) < 0) {
return _PyStatus_ERR("can't initialize warnings");
}
status = _PyAtExit_Init(interp);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
return _PyStatus_OK();
}
static PyStatus
pycore_init_builtins(PyInterpreterState *interp)
pycore_init_builtins(PyThreadState *tstate)
{
PyInterpreterState *interp = tstate->interp;
PyObject *bimod = _PyBuiltin_Init(interp);
if (bimod == NULL) {
goto error;
@ -744,6 +751,7 @@ pycore_init_builtins(PyInterpreterState *interp)
}
interp->import_func = Py_NewRef(import_func);
assert(!_PyErr_Occurred(tstate));
return _PyStatus_OK();
error:
@ -755,29 +763,49 @@ error:
static PyStatus
pycore_interp_init(PyThreadState *tstate)
{
PyInterpreterState *interp = tstate->interp;
PyStatus status;
PyObject *sysmod = NULL;
status = pycore_init_types(tstate->interp);
// Create singletons before the first PyType_Ready() call, since
// PyType_Ready() uses singletons like the Unicode empty string (tp_doc)
// and the empty tuple singletons (tp_bases).
status = pycore_init_singletons(interp);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
// The GC must be initialized before the first GC collection.
status = _PyGC_Init(interp);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
status = pycore_init_types(interp);
if (_PyStatus_EXCEPTION(status)) {
goto done;
}
if (_PyWarnings_InitState(interp) < 0) {
return _PyStatus_ERR("can't initialize warnings");
}
status = _PyAtExit_Init(interp);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
status = _PySys_Create(tstate, &sysmod);
if (_PyStatus_EXCEPTION(status)) {
goto done;
}
assert(!_PyErr_Occurred(tstate));
status = pycore_init_builtins(tstate->interp);
status = pycore_init_builtins(tstate);
if (_PyStatus_EXCEPTION(status)) {
goto done;
}
assert(!_PyErr_Occurred(tstate));
const PyConfig *config = _PyInterpreterState_GetConfig(tstate->interp);
const PyConfig *config = _PyInterpreterState_GetConfig(interp);
if (config->_install_importlib) {
/* This call sets up builtin and frozen import support */
if (init_importlib(tstate, sysmod) < 0) {