https://github.com/python/cpython/commit/c5abded09995f208b21ebaf012185ca5acb0180b
commit: c5abded09995f208b21ebaf012185ca5acb0180b
branch: main
author: Tomasz Pytel <[email protected]>
committer: colesbury <[email protected]>
date: 2025-03-13T12:31:49-04:00
summary:
gh-130382: add missing `_PyReftracerTrack` to ceval `Py_DECREF` (#130689)
files:
A
Misc/NEWS.d/next/Core_and_Builtins/2025-02-28-16-13-02.gh-issue-130382.66VTmy.rst
M Lib/test/test_capi/test_misc.py
M Modules/_testcapimodule.c
M Python/ceval.c
diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py
index 6c4cf5bd6598bc..2e1e8e77d620d1 100644
--- a/Lib/test/test_capi/test_misc.py
+++ b/Lib/test/test_capi/test_misc.py
@@ -2884,5 +2884,22 @@ def test_pack_version_ctypes(self):
self.assertEqual(result, expected)
+class TestCEval(unittest.TestCase):
+ def test_ceval_decref(self):
+ code = textwrap.dedent("""
+ import _testcapi
+ _testcapi.toggle_reftrace_printer(True)
+ l1 = []
+ l2 = []
+ del l1
+ del l2
+ _testcapi.toggle_reftrace_printer(False)
+ """)
+ _, out, _ = assert_python_ok("-c", code)
+ lines = out.decode("utf-8").splitlines()
+ self.assertEqual(lines.count("CREATE list"), 2)
+ self.assertEqual(lines.count("DESTROY list"), 2)
+
+
if __name__ == "__main__":
unittest.main()
diff --git
a/Misc/NEWS.d/next/Core_and_Builtins/2025-02-28-16-13-02.gh-issue-130382.66VTmy.rst
b/Misc/NEWS.d/next/Core_and_Builtins/2025-02-28-16-13-02.gh-issue-130382.66VTmy.rst
new file mode 100644
index 00000000000000..8b775c8fe1cf40
--- /dev/null
+++
b/Misc/NEWS.d/next/Core_and_Builtins/2025-02-28-16-13-02.gh-issue-130382.66VTmy.rst
@@ -0,0 +1 @@
+Fix ``PyRefTracer_DESTROY`` not being sent from :file:`Python/ceval.c`
``Py_DECREF()``.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 9260c7659440ea..409dd02e1435b5 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -2515,6 +2515,31 @@ code_offset_to_line(PyObject* self, PyObject* const*
args, Py_ssize_t nargsf)
}
+static int
+_reftrace_printer(PyObject *obj, PyRefTracerEvent event, void *counter_data)
+{
+ if (event == PyRefTracer_CREATE) {
+ printf("CREATE %s\n", Py_TYPE(obj)->tp_name);
+ }
+ else { // PyRefTracer_DESTROY
+ printf("DESTROY %s\n", Py_TYPE(obj)->tp_name);
+ }
+ return 0;
+}
+
+// A simple reftrace printer for very simple tests
+static PyObject *
+toggle_reftrace_printer(PyObject *ob, PyObject *arg)
+{
+ if (arg == Py_True) {
+ PyRefTracer_SetTracer(_reftrace_printer, NULL);
+ }
+ else {
+ PyRefTracer_SetTracer(NULL, NULL);
+ }
+ Py_RETURN_NONE;
+}
+
static PyMethodDef TestMethods[] = {
{"set_errno", set_errno, METH_VARARGS},
{"test_config", test_config, METH_NOARGS},
@@ -2608,6 +2633,7 @@ static PyMethodDef TestMethods[] = {
{"finalize_thread_hang", finalize_thread_hang, METH_O, NULL},
{"test_atexit", test_atexit, METH_NOARGS},
{"code_offset_to_line", _PyCFunction_CAST(code_offset_to_line),
METH_FASTCALL},
+ {"toggle_reftrace_printer", toggle_reftrace_printer, METH_O},
{NULL, NULL} /* sentinel */
};
diff --git a/Python/ceval.c b/Python/ceval.c
index f9089d7f11f280..34f4417f5fc487 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -80,6 +80,7 @@
} \
_Py_DECREF_STAT_INC(); \
if (--op->ob_refcnt == 0) { \
+ _PyReftracerTrack(op, PyRefTracer_DESTROY); \
destructor dealloc = Py_TYPE(op)->tp_dealloc; \
(*dealloc)(op); \
} \
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
