bpo-46370: Move the static initializer for _PyRuntime to its own head…

…er file. (gh-30587) https://bugs.python.org/issue46370
python · Jan 13, 2022 · bc02eac · bc02eac
1 parent 276c234
commit bc02eac
Show file tree

Hide file tree

Showing 9 changed files with 611 additions and 583 deletions.
diff --git a/Include/internal/pycore_global_objects.h b/Include/internal/pycore_global_objects.h
diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
@@ -12,6 +12,19 @@ extern "C" {
 #include "pycore_interp.h"        // PyInterpreterState.gc
 #include "pycore_pystate.h"       // _PyInterpreterState_GET()
 
+
+#define _PyObject_IMMORTAL_INIT(type) \
+    { \
+        .ob_refcnt = 999999999, \
+        .ob_type = type, \
+    }
+#define _PyVarObject_IMMORTAL_INIT(type, size) \
+    { \
+        .ob_base = _PyObject_IMMORTAL_INIT(type), \
+        .ob_size = size, \
+    }
+
+
 PyAPI_FUNC(int) _PyType_CheckConsistency(PyTypeObject *type);
 PyAPI_FUNC(int) _PyDict_CheckConsistency(PyObject *mp, int check_content);
 

diff --git a/Include/internal/pycore_runtime.h b/Include/internal/pycore_runtime.h
@@ -148,21 +148,6 @@ typedef struct pyruntimestate {
     PyInterpreterState _main_interpreter;
 } _PyRuntimeState;
 
-#define _PyThreadState_INIT \
-    { \
-        ._static = 1, \
-    }
-#define _PyInterpreterState_INIT \
-    { \
-        ._static = 1, \
-        ._initial_thread = _PyThreadState_INIT, \
-    }
-#define _PyRuntimeState_INIT \
-    { \
-        .global_objects = _Py_global_objects_INIT, \
-        ._main_interpreter = _PyInterpreterState_INIT, \
-    }
-
 
 /* other API */