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

gh-107630: Initialize Each Interpreter's refchain Properly (gh-107733) 

This finishes fixing the crashes in Py_TRACE_REFS builds.  We missed this part in gh-107567.
This commit is contained in:
Eric Snow 2023-08-07 13:14:56 -06:00 committed by GitHub
parent 16c9415fba
commit 430632d6f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Include/internal/pycore_object.h
View File

@ -173,6 +173,7 @@ _PyType_HasFeature(PyTypeObject *type, unsigned long feature) {
extern void _PyType_InitCache(PyInterpreterState *interp); extern void _PyType_InitCache(PyInterpreterState *interp);
extern void _PyObject_InitState(PyInterpreterState *interp);
/* Inline functions trading binary compatibility for speed: /* Inline functions trading binary compatibility for speed:
_PyObject_Init() is the fast version of PyObject_Init(), and _PyObject_Init() is the fast version of PyObject_Init(), and

22
Objects/object.c
View File

@ -162,6 +162,14 @@ _PyDebug_PrintTotalRefs(void) {
#define REFCHAIN(interp) &interp->object_state.refchain #define REFCHAIN(interp) &interp->object_state.refchain
static inline void
init_refchain(PyInterpreterState *interp)
{
PyObject *refchain = REFCHAIN(interp);
refchain->_ob_prev = refchain;
refchain->_ob_next = refchain;
}
/* Insert op at the front of the list of all objects. If force is true, /* Insert op at the front of the list of all objects. If force is true,
* op is added even if _ob_prev and _ob_next are non-NULL already. If * op is added even if _ob_prev and _ob_next are non-NULL already. If
* force is false amd _ob_prev or _ob_next are non-NULL, do nothing. * force is false amd _ob_prev or _ob_next are non-NULL, do nothing.
@ -2019,6 +2027,18 @@ PyObject _Py_NotImplementedStruct = {
&_PyNotImplemented_Type &_PyNotImplemented_Type
}; };
void
_PyObject_InitState(PyInterpreterState *interp)
{
#ifdef Py_TRACE_REFS
if (!_Py_IsMainInterpreter(interp)) {
init_refchain(interp);
}
#endif
}
extern PyTypeObject _Py_GenericAliasIterType; extern PyTypeObject _Py_GenericAliasIterType;
extern PyTypeObject _PyMemoryIter_Type; extern PyTypeObject _PyMemoryIter_Type;
extern PyTypeObject _PyLineIterator; extern PyTypeObject _PyLineIterator;
@ -2326,7 +2346,7 @@ _Py_GetObjects(PyObject *self, PyObject *args)
#undef REFCHAIN #undef REFCHAIN
#endif #endif /* Py_TRACE_REFS */
/* Hack to force loading of abstract.o */ /* Hack to force loading of abstract.o */

2
Python/pylifecycle.c
View File

@ -2075,6 +2075,8 @@ new_interpreter(PyThreadState **tstate_p, const PyInterpreterConfig *config)
} }
has_gil = 1; has_gil = 1;
/* No objects have been created yet. */
status = pycore_interp_init(tstate); status = pycore_interp_init(tstate);
if (_PyStatus_EXCEPTION(status)) { if (_PyStatus_EXCEPTION(status)) {
goto error; goto error;

1
Python/pystate.c
View File

@ -674,6 +674,7 @@ init_interpreter(PyInterpreterState *interp,
_obmalloc_pools_INIT(interp->obmalloc.pools); _obmalloc_pools_INIT(interp->obmalloc.pools);
memcpy(&interp->obmalloc.pools.used, temp, sizeof(temp)); memcpy(&interp->obmalloc.pools.used, temp, sizeof(temp));
} }
_PyObject_InitState(interp);
_PyEval_InitState(interp, pending_lock); _PyEval_InitState(interp, pending_lock);
_PyGC_InitState(&interp->gc); _PyGC_InitState(&interp->gc);