From: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Date: Mon, 9 Aug 2021 17:11:38 +0000 (+0100)
Subject: bpo-44872: use new trashcan macros in framobject.c (#27683)
X-Git-Tag: v3.11.0a1~439
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d14fdb03c3e8384c01da1b21647ce837ed6a29c;p=thirdparty%2FPython%2Fcpython.git

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

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 d1b8048fcead..2af69597c396 100644
--- 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