mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 09:15:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

bpo-38631: Avoid Py_FatalError() in handle_legacy_finalizers() (GH-17266)

Browse source 
* Rename _PyGC_Initialize() to _PyGC_InitializeRuntime()
* Add _PyGC_Init(): initialize _PyRuntime.gc.garbage list
* Call _PyGC_Init() before _PyTypes_Init()
This commit is contained in:
Victor Stinner 2019-11-20 01:18:11 +01:00 • committed by GitHub
parent e0cd8aa70a
commit 444b39bb64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Python/pylifecycle.c
View file

@ -558,9 +558,16 @@ pycore_create_interpreter(_PyRuntimeState *runtime,
static PyStatus
pycore_init_types(void)
pycore_init_types(_PyRuntimeState *runtime)
{
PyStatus status = _PyTypes_Init();
PyStatus status;
status = _PyGC_Init(runtime);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
status = _PyTypes_Init();
if (_PyStatus_EXCEPTION(status)) {
return status;
}
@ -683,7 +690,7 @@ pyinit_config(_PyRuntimeState *runtime,
config = &tstate->interp->config;
*tstate_p = tstate;
status = pycore_init_types();
status = pycore_init_types(runtime);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
@ -1447,7 +1454,7 @@ new_interpreter(PyThreadState **tstate_p)
}
config = &interp->config;
status = pycore_init_types();
status = pycore_init_types(runtime);
/* XXX The following is lax in error checking */
PyObject *modules = PyDict_New();

2
Python/pystate.c
View file

@ -58,7 +58,7 @@ _PyRuntimeState_Init_impl(_PyRuntimeState *runtime)
runtime->open_code_userdata = open_code_userdata;
runtime->audit_hook_head = audit_hook_head;
_PyGC_Initialize(&runtime->gc);
_PyGC_InitializeRuntime(&runtime->gc);
_PyEval_Initialize(&runtime->ceval);
PyPreConfig_InitPythonConfig(&runtime->preconfig);