]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-44872: use new trashcan macros in framobject.c (GH-27683) (GH-27692)
authorIrit Katriel <1055913+iritkatriel@users.noreply.github.com>
Tue, 10 Aug 2021 07:55:46 +0000 (08:55 +0100)
committerGitHub <noreply@github.com>
Tue, 10 Aug 2021 07:55:46 +0000 (09:55 +0200)
Misc/NEWS.d/next/Core and Builtins/2021-08-09-16-16-03.bpo-44872.OKRlhK.rst [new file with mode: 0644]
Objects/frameobject.c

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 (file)
index 0000000..9a0d000
--- /dev/null
@@ -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
index 3abd8e52d859d9e8e3a1e7dbabccd6cf446a6c11..5ca5e06b03f7ed22fb8238cd3e6de17f267aedc8 100644 (file)
@@ -423,7 +423,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++)
@@ -453,7 +453,7 @@ frame_dealloc(PyFrameObject *f)
         PyObject_GC_Del(f);
 
     Py_DECREF(co);
-    Py_TRASHCAN_SAFE_END(f)
+    Py_TRASHCAN_END;
 }
 
 static int