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

iritkatriel · web-flow · commit 7d14fdb03c3e · 2021-08-09T18:11:38.000+01: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
@@ -619,7 +619,7 @@ frame_dealloc(PyFrameObject *f)
         _PyObject_GC_UNTRACK(f);
     }
 
-    Py_TRASHCAN_SAFE_BEGIN(f)
+    Py_TRASHCAN_BEGIN(f, frame_dealloc);
     PyCodeObject *co = NULL;
 
     /* Kill all local variables including specials, if we own them */
@@ -659,7 +659,7 @@ frame_dealloc(PyFrameObject *f)
     }
 
     Py_XDECREF(co);
-    Py_TRASHCAN_SAFE_END(f)
+    Py_TRASHCAN_END;
 }
 
 static int

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
`@@ -619,7 +619,7 @@ frame_dealloc(PyFrameObject *f)`
`619`	`619`	`_PyObject_GC_UNTRACK(f);`
`620`	`620`	`}`
`621`	`621`
`622`		`- Py_TRASHCAN_SAFE_BEGIN(f)`
	`622`	`+ Py_TRASHCAN_BEGIN(f, frame_dealloc);`
`623`	`623`	`PyCodeObject *co = NULL;`
`624`	`624`
`625`	`625`	`/* Kill all local variables including specials, if we own them */`
`@@ -659,7 +659,7 @@ frame_dealloc(PyFrameObject *f)`
`659`	`659`	`}`
`660`	`660`
`661`	`661`	`Py_XDECREF(co);`
`662`		`- Py_TRASHCAN_SAFE_END(f)`
	`662`	`+ Py_TRASHCAN_END;`
`663`	`663`	`}`
`664`	`664`
`665`	`665`	`static int`