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

iritkatriel · web-flow · commit ede1dc416de5 · 2021-08-10T09:55:39.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
@@ -575,7 +575,7 @@ frame_dealloc(PyFrameObject *f)
     if (_PyObject_GC_IS_TRACKED(f))
         _PyObject_GC_UNTRACK(f);
 
-    Py_TRASHCAN_SAFE_BEGIN(f)
+    Py_TRASHCAN_BEGIN(f, frame_dealloc);
     /* Kill all local variables */
     valuestack = f->f_valuestack;
     for (p = f->f_localsplus; p < valuestack; p++)
@@ -609,7 +609,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
`@@ -575,7 +575,7 @@ frame_dealloc(PyFrameObject *f)`
`575`	`575`	`if (_PyObject_GC_IS_TRACKED(f))`
`576`	`576`	`_PyObject_GC_UNTRACK(f);`
`577`	`577`
`578`		`- Py_TRASHCAN_SAFE_BEGIN(f)`
	`578`	`+ Py_TRASHCAN_BEGIN(f, frame_dealloc);`
`579`	`579`	`/* Kill all local variables */`
`580`	`580`	`valuestack = f->f_valuestack;`
`581`	`581`	`for (p = f->f_localsplus; p < valuestack; p++)`
`@@ -609,7 +609,7 @@ frame_dealloc(PyFrameObject *f)`
`609`	`609`	`}`
`610`	`610`
`611`	`611`	`Py_DECREF(co);`
`612`		`- Py_TRASHCAN_SAFE_END(f)`
	`612`	`+ Py_TRASHCAN_END;`
`613`	`613`	`}`
`614`	`614`
`615`	`615`	`static inline Py_ssize_t`