bpo-44872: use new trashcan macros in framobject.c (GH-27683) (GH-27690)

iritkatriel · web-flow · commit e9ec71ad2c7a · 2021-08-10T09:56:14.000+02:00
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
@@ -0,0 +1 @@
+Use new trashcan macros (Py_TRASHCAN_BEGIN/END) in frameobject.c instead of the old ones (Py_TRASHCAN_SAFE_BEGIN/END).
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Use new trashcan macros (Py_TRASHCAN_BEGIN/END) in frameobject.c instead of the old ones (Py_TRASHCAN_SAFE_BEGIN/END).`
Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,7 @@ frame_dealloc(PyFrameObject *f)`
`581`	`581`	`_PyObject_GC_UNTRACK(f);`
`582`	`582`	`}`
`583`	`583`
`584`		`- Py_TRASHCAN_SAFE_BEGIN(f)`
	`584`	`+ Py_TRASHCAN_BEGIN(f, frame_dealloc);`
`585`	`585`	`/* Kill all local variables */`
`586`	`586`	`PyObject **valuestack = f->f_valuestack;`
`587`	`587`	`for (PyObject **p = f->f_localsplus; p < valuestack; p++) {`
`@@ -621,7 +621,7 @@ frame_dealloc(PyFrameObject *f)`
`621`	`621`	`}`
`622`	`622`
`623`	`623`	`Py_DECREF(co);`
`624`		`- Py_TRASHCAN_SAFE_END(f)`
	`624`	`+ Py_TRASHCAN_END;`
`625`	`625`	`}`
`626`	`626`
`627`	`627`	`static inline Py_ssize_t`