From 940c937c1369291832024fa210827fa678366181 Mon Sep 17 00:00:00 2001 From: Donghee Na Date: Fri, 28 Mar 2025 22:55:58 +0900 Subject: [PATCH] [3.12] gh-131740: Update PyUnstable_GC_VisitObjects to traverse perm gen (#131828) --- ...-03-26-06-56-40.gh-issue-131740.9PdxxQ.rst | 1 + Modules/gcmodule.c | 30 ++++++++++++------- 2 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 Misc/NEWS.d/next/C API/2025-03-26-06-56-40.gh-issue-131740.9PdxxQ.rst diff --git a/Misc/NEWS.d/next/C API/2025-03-26-06-56-40.gh-issue-131740.9PdxxQ.rst b/Misc/NEWS.d/next/C API/2025-03-26-06-56-40.gh-issue-131740.9PdxxQ.rst new file mode 100644 index 000000000000..585f07aaddd8 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2025-03-26-06-56-40.gh-issue-131740.9PdxxQ.rst @@ -0,0 +1 @@ +Update PyUnstable_GC_VisitObjects to traverse perm gen. diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index e14d9d58f8c4..cd1115b0288f 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -2443,6 +2443,23 @@ PyObject_GC_IsFinalized(PyObject *obj) return 0; } +static int +visit_generation(gcvisitobjects_t callback, void *arg, struct gc_generation *gen) +{ + PyGC_Head *gc_list, *gc; + gc_list = &gen->head; + for (gc = GC_NEXT(gc_list); gc != gc_list; gc = GC_NEXT(gc)) { + PyObject *op = FROM_GC(gc); + Py_INCREF(op); + int res = callback(op, arg); + Py_DECREF(op); + if (!res) { + return -1; + } + } + return 0; +} + void PyUnstable_GC_VisitObjects(gcvisitobjects_t callback, void *arg) { @@ -2451,18 +2468,11 @@ PyUnstable_GC_VisitObjects(gcvisitobjects_t callback, void *arg) int origenstate = gcstate->enabled; gcstate->enabled = 0; for (i = 0; i < NUM_GENERATIONS; i++) { - PyGC_Head *gc_list, *gc; - gc_list = GEN_HEAD(gcstate, i); - for (gc = GC_NEXT(gc_list); gc != gc_list; gc = GC_NEXT(gc)) { - PyObject *op = FROM_GC(gc); - Py_INCREF(op); - int res = callback(op, arg); - Py_DECREF(op); - if (!res) { - goto done; - } + if (visit_generation(callback, arg, &gcstate->generations[i])) { + goto done; } } + visit_generation(callback, arg, &gcstate->permanent_generation); done: gcstate->enabled = origenstate; } -- 2.47.3