diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst new file mode 100644 index 00000000000000..9a0d00018b2a7c --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst @@ -0,0 +1 @@ +Use new trashcan macros (Py_TRASHCAN_BEGIN/END) in frameobject.c instead of the old ones (Py_TRASHCAN_SAFE_BEGIN/END). \ No newline at end of file diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 034b908ade31cc..aa973016aefeac 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -581,7 +581,7 @@ frame_dealloc(PyFrameObject *f) _PyObject_GC_UNTRACK(f); } - Py_TRASHCAN_SAFE_BEGIN(f) + Py_TRASHCAN_BEGIN(f, frame_dealloc); /* Kill all local variables */ PyObject **valuestack = f->f_valuestack; for (PyObject **p = f->f_localsplus; p < valuestack; p++) { @@ -621,7 +621,7 @@ frame_dealloc(PyFrameObject *f) } Py_DECREF(co); - Py_TRASHCAN_SAFE_END(f) + Py_TRASHCAN_END; } static inline Py_ssize_t