From: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Date: Tue, 10 Aug 2021 07:55:39 +0000 (+0100)
Subject: bpo-44872: use new trashcan macros in framobject.c (GH-27683) (GH-27691)
X-Git-Tag: v3.9.7~63
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ede1dc416de5eece02170e03387dc8496c2d00ae;p=thirdparty%2FPython%2Fcpython.git

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

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 000000000000..9a0d00018b2a
--- /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 50846dec50e8..4ae17bcfc210 100644
--- 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