https://github.com/python/cpython/commit/5646f6f73964a85eaf4757cb4c89eacb00a1670d commit: 5646f6f73964a85eaf4757cb4c89eacb00a1670d branch: 3.13 author: Sam Gross <colesb...@gmail.com> committer: colesbury <colesb...@gmail.com> date: 2025-03-14T09:52:05-04:00 summary:
[3.13] gh-130382: add missing `_PyReftracerTrack` to ceval `Py_DECREF` (GH-130689) (#131195) (cherry picked from commit c5abded09995f208b21ebaf012185ca5acb0180b) Co-authored-by: Tomasz Pytel <tompy...@gmail.com> 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 f0b872627f6f93..c3012155e00068 100644 --- a/Lib/test/test_capi/test_misc.py +++ b/Lib/test/test_capi/test_misc.py @@ -3186,5 +3186,22 @@ def run(self): py_thread_ids) +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 fd6ca815f22efa..97e046a48225a1 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -3421,6 +3421,31 @@ tracemalloc_track_race(PyObject *self, PyObject *args) #undef NTHREAD } +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}, @@ -3564,6 +3589,7 @@ static PyMethodDef TestMethods[] = { {"test_critical_sections", test_critical_sections, METH_NOARGS}, {"test_atexit", test_atexit, METH_NOARGS}, {"tracemalloc_track_race", tracemalloc_track_race, METH_NOARGS}, + {"toggle_reftrace_printer", toggle_reftrace_printer, METH_O}, {NULL, NULL} /* sentinel */ }; diff --git a/Python/ceval.c b/Python/ceval.c index d5a08a38f0ada9..7bffa447e19c62 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -70,6 +70,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 -- python-checkins@python.org To unsubscribe send an email to python-checkins-le...@python.org https://mail.python.org/mailman3/lists/python-checkins.python.org/ Member address: arch...@mail-archive.com