Use _PyFrame_GetLocalsArray

colesbury · colesbury · commit 5b9176b5d262 · 2024-08-13T21:06:10.000Z
diff --git a/Python/gc.c b/Python/gc.c
@@ -537,10 +537,10 @@ visit_decref(PyObject *op, void *parent)
 int
 _PyGC_VisitFrameStack(_PyInterpreterFrame *frame, visitproc visit, void *arg)
 {
-    _PyStackRef *i = frame->localsplus;
+    _PyStackRef *ref = _PyFrame_GetLocalsArray(frame);
     /* locals and stack */
-    for (; i < frame->stackpointer; i++) {
-        Py_VISIT(PyStackRef_AsPyObjectBorrow(*i));
+    for (; ref < frame->stackpointer; ref++) {
+        Py_VISIT(PyStackRef_AsPyObjectBorrow(*ref));
     }
     return 0;
 }
diff --git a/Python/gc_free_threading.c b/Python/gc_free_threading.c
@@ -954,7 +954,7 @@ visit_decref_unreachable(PyObject *op, void *data)
 int
 _PyGC_VisitFrameStack(_PyInterpreterFrame *frame, visitproc visit, void *arg)
 {
-    _PyStackRef *ref = frame->localsplus;
+    _PyStackRef *ref = _PyFrame_GetLocalsArray(frame);
     /* locals and stack */
     for (; ref < frame->stackpointer; ref++) {
         // This is a bit tricky! We want to ignore deferred references when

Original file line number	Diff line number	Diff line change
`@@ -537,10 +537,10 @@ visit_decref(PyObject op, void parent)`
`537`	`537`	`int`
`538`	`538`	`_PyGC_VisitFrameStack(_PyInterpreterFrame frame, visitproc visit, void arg)`
`539`	`539`	`{`
`540`		`- _PyStackRef *i = frame->localsplus;`
	`540`	`+ _PyStackRef *ref = _PyFrame_GetLocalsArray(frame);`
`541`	`541`	`/* locals and stack */`
`542`		`- for (; i < frame->stackpointer; i++) {`
`543`		`- Py_VISIT(PyStackRef_AsPyObjectBorrow(*i));`
	`542`	`+ for (; ref < frame->stackpointer; ref++) {`
	`543`	`+ Py_VISIT(PyStackRef_AsPyObjectBorrow(*ref));`
`544`	`544`	`}`
`545`	`545`	`return 0;`
`546`	`546`	`}`
Original file line number	Diff line number	Diff line change
`@@ -954,7 +954,7 @@ visit_decref_unreachable(PyObject op, void data)`
`954`	`954`	`int`
`955`	`955`	`_PyGC_VisitFrameStack(_PyInterpreterFrame frame, visitproc visit, void arg)`
`956`	`956`	`{`
`957`		`- _PyStackRef *ref = frame->localsplus;`
	`957`	`+ _PyStackRef *ref = _PyFrame_GetLocalsArray(frame);`
`958`	`958`	`/* locals and stack */`
`959`	`959`	`for (; ref < frame->stackpointer; ref++) {`
`960`	`960`	`// This is a bit tricky! We want to ignore deferred references when`