remove _static field

kumaraditya303 · web-flow · commit 73d60cadc2f6 · 2022-11-11T16:59:22.000Z
diff --git a/Include/cpython/pystate.h b/Include/cpython/pystate.h
@@ -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;
 
diff --git a/Include/internal/pycore_interp.h b/Include/internal/pycore_interp.h
@@ -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;
 
diff --git a/Include/internal/pycore_runtime_init.h b/Include/internal/pycore_runtime_init.h
@@ -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, \
     }
diff --git a/Python/pystate.c b/Python/pystate.c
@@ -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 main thread 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.
@@ -856,7 +855,6 @@ new_threadstate(PyInterpreterState *interp)
                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;
 

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,9 @@ alloc_interpreter(void)`
`272`	`272`	`static void`
`273`	`273`	`free_interpreter(PyInterpreterState *interp)`
`274`	`274`	`{`
`275`		`- if (!interp->_static) {`
	`275`	`+ // The main interpreter is statically allocated so`
	`276`	`+ // should not be freed.`
	`277`	`+ if (interp != &_PyRuntime._main_interpreter) {`
`276`	`278`	`PyMem_RawFree(interp);`
`277`	`279`	`}`
`278`	`280`	`}`
`@@ -356,7 +358,6 @@ PyInterpreterState_New(void)`
`356`	`358`	`interp = &runtime->_main_interpreter;`
`357`	`359`	`assert(interp->id == 0);`
`358`	`360`	`assert(interp->next == NULL);`
`359`		`- assert(interp->_static);`
`360`	`361`
`361`	`362`	`interpreters->main = interp;`
`362`	`363`	`}`
`@@ -371,9 +372,6 @@ PyInterpreterState_New(void)`
`371`	`372`	`// Set to _PyInterpreterState_INIT.`
`372`	`373`	`memcpy(interp, &initial._main_interpreter,`
`373`	`374`	`sizeof(*interp));`
`374`		`- // We need to adjust any fields that are different from the initial`
`375`		`- // interpreter (as defined in _PyInterpreterState_INIT):`
`376`		`- interp->_static = false;`
`377`	`375`
`378`	`376`	`if (id < 0) {`
`379`	`377`	`/* overflow or Py_Initialize() not called yet! */`
`@@ -759,7 +757,9 @@ alloc_threadstate(void)`
`759`	`757`	`static void`
`760`	`758`	`free_threadstate(PyThreadState *tstate)`
`761`	`759`	`{`
`762`		`- if (!tstate->_static) {`
	`760`	`+ // The main thread of the interpreter is allocated`
	`761`	`+ // as part of the interpreter state so should not be freed.`
	`762`	`+ if (tstate != &tstate->interp->_initial_thread) {`
`763`	`763`	`PyMem_RawFree(tstate);`
`764`	`764`	`}`
`765`	`765`	`}`
`@@ -842,7 +842,6 @@ new_threadstate(PyInterpreterState *interp)`
`842`	`842`	`assert(id == 1);`
`843`	`843`	`used_newtstate = 0;`
`844`	`844`	`tstate = &interp->_initial_thread;`
`845`		`- assert(tstate->_static);`
`846`	`845`	`}`
`847`	`846`	`else {`
`848`	`847`	`// Every valid interpreter must have at least one thread.`
`@@ -856,7 +855,6 @@ new_threadstate(PyInterpreterState *interp)`
`856`	`855`	`sizeof(*tstate));`
`857`	`856`	`// We need to adjust any fields that are different from the initial`
`858`	`857`	`// thread (as defined in _PyThreadState_INIT):`
`859`		`- tstate->_static = false;`
`860`	`858`	`}`
`861`	`859`	`interp->threads.head = tstate;`
`862`	`860`