python · miss-islington · Nov 15, 2022 · Nov 11, 2022 · Nov 11, 2022 · Nov 14, 2022
@@ -120,9 +120,6 @@ struct _ts {
        after allocation. */
     int _initialized;
 
-    /* Was this thread state statically allocated? */
-    int _static;
-
     int py_recursion_remaining;
     int py_recursion_limit;
 

@@ -115,9 +115,6 @@ struct _is {
     int _initialized;
     int finalizing;
 
-    /* Was this interpreter statically allocated? */
-    bool _static;
-
     struct _ceval_state ceval;
     struct _gc_runtime_state gc;
 

@@ -47,7 +47,6 @@ extern "C" {
 
 #define _PyInterpreterState_INIT \
     { \
-        ._static = 1, \
         .id_refcount = -1, \
         DLOPENFLAGS_INIT \
         .ceval = { \
@@ -67,7 +66,6 @@ extern "C" {
 
 #define _PyThreadState_INIT \
     { \
-        ._static = 1, \
         .py_recursion_limit = Py_DEFAULT_RECURSION_LIMIT, \
         .context_ver = 1, \
     }

@@ -272,7 +272,9 @@ alloc_interpreter(void)
 static void
 free_interpreter(PyInterpreterState *interp)
 {
-    if (!interp->_static) {
+    // The main interpreter is statically allocated so
+    // should not be freed.
+    if (interp != &_PyRuntime._main_interpreter) {
         PyMem_RawFree(interp);
     }
 }
@@ -356,7 +358,6 @@ PyInterpreterState_New(void)
         interp = &runtime->_main_interpreter;
         assert(interp->id == 0);
         assert(interp->next == NULL);
-        assert(interp->_static);
 
         interpreters->main = interp;
     }
@@ -371,9 +372,6 @@ PyInterpreterState_New(void)
         // Set to _PyInterpreterState_INIT.
         memcpy(interp, &initial._main_interpreter,
                sizeof(*interp));
-        // We need to adjust any fields that are different from the initial
-        // interpreter (as defined in _PyInterpreterState_INIT):
-        interp->_static = false;
 
         if (id < 0) {
             /* overflow or Py_Initialize() not called yet! */
@@ -759,7 +757,9 @@ alloc_threadstate(void)
 static void
 free_threadstate(PyThreadState *tstate)
 {
-    if (!tstate->_static) {
+    // The initial thread state of the interpreter is allocated
+    // as part of the interpreter state so should not be freed.
+    if (tstate != &tstate->interp->_initial_thread) {
         PyMem_RawFree(tstate);
     }
 }
@@ -842,7 +842,6 @@ new_threadstate(PyInterpreterState *interp)
         assert(id == 1);
         used_newtstate = 0;
         tstate = &interp->_initial_thread;
-        assert(tstate->_static);
     }
     else {
         // Every valid interpreter must have at least one thread.
@@ -854,9 +853,6 @@ new_threadstate(PyInterpreterState *interp)
         memcpy(tstate,
                &initial._main_interpreter._initial_thread,
                sizeof(*tstate));
-        // We need to adjust any fields that are different from the initial
-        // thread (as defined in _PyThreadState_INIT):
-        tstate->_static = false;
     }
     interp->threads.head = tstate;