Fix the ABI

vstinner · Jan 12, 2022 · Jan 12, 2022 · Jan 12, 2022 · 01c415597102f94edc07cee47c99577fed53241e
commit 01c415597102f94edc07cee47c99577fed53241e
diff --git a/Include/internal/pycore_gc.h b/Include/internal/pycore_gc.h
@@ -161,7 +161,7 @@ struct _gc_runtime_state {
     Py_ssize_t long_lived_pending;
 };
 
-extern void _PyGC_InitializeRuntime(struct _gc_runtime_state *);
+extern void _PyGC_InitState(struct _gc_runtime_state *);
 
 extern Py_ssize_t _PyGC_CollectNoFail(PyThreadState *tstate);
 

diff --git a/Include/internal/pycore_interp.h b/Include/internal/pycore_interp.h
@@ -11,6 +11,7 @@ extern "C" {
 #include "pycore_atomic.h"        // _Py_atomic_address
 #include "pycore_ast_state.h"     // struct ast_state
 #include "pycore_gil.h"           // struct _gil_runtime_state
+#include "pycore_gc.h"            // struct _gc_runtime_state
 #include "pycore_warnings.h"      // struct _warnings_runtime_state
 
 struct _pending_calls {
@@ -228,6 +229,9 @@ struct _is {
     int finalizing;
 
     struct _ceval_state ceval;
+    // bpo-46070: Even if each PyInterpreterState has a GC state,
+    // _PyGC_GetState() only uses the state of the main interpreter.
+    struct _gc_runtime_state gc;
 
     // sys.modules dictionary
     PyObject *modules;

diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
@@ -57,6 +57,16 @@ _PyObject_InitVar(PyVarObject *op, PyTypeObject *typeobj, Py_ssize_t size)
 }
 
 
+static inline struct _gc_runtime_state*
+_PyGC_GetState(void)
+{
+    // bpo-46070: Even if each PyInterpreterState has a GC state,
+    // _PyGC_GetState() only uses the state of the main interpreter.
+    PyInterpreterState *interp = _PyRuntime.interpreters.main;
+    return &interp->gc;
+}
+
+
 /* Tell the GC to track this object.
  *
  * The object must not be tracked by the GC.
@@ -87,8 +97,8 @@ static inline void _PyObject_GC_TRACK(
                           "object is in generation which is garbage collected",
                           filename, lineno, __func__);
 
-    _PyRuntimeState *runtime = &_PyRuntime;
-    PyGC_Head *generation0 = runtime->gc.generation0;
+    struct _gc_runtime_state *state = _PyGC_GetState();
+    PyGC_Head *generation0 = state->generation0;
     PyGC_Head *last = (PyGC_Head*)(generation0->_gc_prev);
     _PyGCHead_SET_NEXT(last, gc);
     _PyGCHead_SET_PREV(gc, last);

diff --git a/Include/internal/pycore_runtime.h b/Include/internal/pycore_runtime.h
@@ -9,7 +9,6 @@ extern "C" {
 #endif
 
 #include "pycore_atomic.h"    /* _Py_atomic_address */
-#include "pycore_gc.h"        // struct _gc_runtime_state
 #include "pycore_gil.h"       // struct _gil_runtime_state
 
 /* ceval state */
@@ -105,7 +104,6 @@ typedef struct pyruntimestate {
     void (*exitfuncs[NEXITFUNCS])(void);
     int nexitfuncs;
 
-    struct _gc_runtime_state gc;
     struct _ceval_runtime_state ceval;
     struct _gilstate_runtime_state gilstate;
 

@@ -131,13 +131,12 @@ gc_decref(PyGC_Head *g)
 static GCState *
 get_gc_state(void)
 {
-    _PyRuntimeState *runtime = &_PyRuntime;
-    return &runtime->gc;
+    return _PyGC_GetState();
 }
 
 
 void
-_PyGC_InitializeRuntime(GCState *gcstate)
+_PyGC_InitState(GCState *gcstate)
 {
     gcstate->enabled = 1; /* automatic collection enabled? */
 

diff --git a/Objects/object.c b/Objects/object.c
@@ -2099,8 +2099,7 @@ Py_ReprLeave(PyObject *obj)
 void
 _PyTrash_deposit_object(PyObject *op)
 {
-    _PyRuntimeState *runtime = &_PyRuntime;
-    struct _gc_runtime_state *gcstate = &runtime->gc;
+    struct _gc_runtime_state *gcstate = _PyGC_GetState();
 
     _PyObject_ASSERT(op, _PyObject_IS_GC(op));
     _PyObject_ASSERT(op, !_PyObject_GC_IS_TRACKED(op));
@@ -2127,8 +2126,7 @@ _PyTrash_thread_deposit_object(PyObject *op)
 void
 _PyTrash_destroy_chain(void)
 {
-    _PyRuntimeState *runtime = &_PyRuntime;
-    struct _gc_runtime_state *gcstate = &runtime->gc;
+    struct _gc_runtime_state *gcstate = _PyGC_GetState();
 
     while (gcstate->trash_delete_later) {
         PyObject *op = gcstate->trash_delete_later;

diff --git a/Python/pystate.c b/Python/pystate.c
@@ -65,7 +65,6 @@ _PyRuntimeState_Init_impl(_PyRuntimeState *runtime)
     runtime->audit_hook_head = audit_hook_head;
 
     _PyEval_InitRuntimeState(&runtime->ceval);
-    _PyGC_InitializeRuntime(&runtime->gc);
 
     PyPreConfig_InitPythonConfig(&runtime->preconfig);
 
@@ -229,6 +228,7 @@ PyInterpreterState_New(void)
         goto out_of_memory;
     }
 
+    _PyGC_InitState(&interp->gc);
     PyConfig_InitPythonConfig(&interp->config);
     _PyType_InitCache(interp);
 

diff --git a/Python/traceback.c b/Python/traceback.c
@@ -5,7 +5,7 @@
 
 #include "code.h"
 #include "pycore_interp.h"        // PyInterpreterState.gc
-#include "pycore_runtime.h"       // _PyRuntime
+#include "pycore_object.h"        // _PyGC_GetState()
 #include "frameobject.h"          // PyFrame_GetBack()
 #include "structmember.h"         // PyMemberDef
 #include "osdefs.h"               // SEP
@@ -926,7 +926,7 @@ _Py_DumpTracebackThreads(int fd, PyInterpreterState *interp,
         return "unable to get the thread head state";
 
     /* Dump the traceback of each thread */
-    _PyRuntimeState *runtime = &_PyRuntime;
+    struct _gc_runtime_state *gcstate = _PyGC_GetState();
     tstate = PyInterpreterState_ThreadHead(interp);
     nthreads = 0;
     _Py_BEGIN_SUPPRESS_IPH
@@ -939,7 +939,7 @@ _Py_DumpTracebackThreads(int fd, PyInterpreterState *interp,
             break;
         }
         write_thread_id(fd, tstate, tstate == current_tstate);
-        if (tstate == current_tstate && runtime->gc.collecting) {
+        if (tstate == current_tstate && gcstate->collecting) {
             PUTS(fd, "  Garbage-collecting\n");
         }
         dump_traceback(fd, tstate, 0);