python
diff --git a/‎Include/internal/pycore_pystate.h
Lines changed: 1 addition & 1 deletion b/‎Include/internal/pycore_pystate.h
Lines changed: 1 addition & 1 deletion
diff --git a/‎Python/ceval_gil.c
Lines changed: 6 additions & 8 deletions b/‎Python/ceval_gil.c
Lines changed: 6 additions & 8 deletions
@@ -142,7 +142,7 @@ _PyThreadState_UpdateTracingState(PyThreadState *tstate)
 /* Other */
 
 PyAPI_FUNC(PyThreadState *) _PyThreadState_Swap(
-    struct _gilstate_runtime_state *gilstate,
+    _PyRuntimeState *runtime,
     PyThreadState *newts);
 
 PyAPI_FUNC(PyStatus) _PyInterpreterState_Enable(_PyRuntimeState *runtime);
 
@@ -581,8 +581,7 @@ PyEval_AcquireThread(PyThreadState *tstate)
 
     take_gil(tstate);
 
-    struct _gilstate_runtime_state *gilstate = &tstate->interp->runtime->gilstate;
-    if (_PyThreadState_Swap(gilstate, tstate) != NULL) {
+    if (_PyThreadState_Swap(tstate->interp->runtime, tstate) != NULL) {
         Py_FatalError("non-NULL old thread state");
     }
 }
@@ -593,7 +592,7 @@ PyEval_ReleaseThread(PyThreadState *tstate)
     assert(is_tstate_valid(tstate));
 
     _PyRuntimeState *runtime = tstate->interp->runtime;
-    PyThreadState *new_tstate = _PyThreadState_Swap(&runtime->gilstate, NULL);
+    PyThreadState *new_tstate = _PyThreadState_Swap(runtime, NULL);
     if (new_tstate != tstate) {
         Py_FatalError("wrong thread state");
     }
@@ -643,7 +642,7 @@ PyThreadState *
 PyEval_SaveThread(void)
 {
     _PyRuntimeState *runtime = &_PyRuntime;
-    PyThreadState *tstate = _PyThreadState_Swap(&runtime->gilstate, NULL);
+    PyThreadState *tstate = _PyThreadState_Swap(runtime, NULL);
     _Py_EnsureTstateNotNULL(tstate);
 
     struct _ceval_runtime_state *ceval = &runtime->ceval;
@@ -660,8 +659,7 @@ PyEval_RestoreThread(PyThreadState *tstate)
 
     take_gil(tstate);
 
-    struct _gilstate_runtime_state *gilstate = &tstate->interp->runtime->gilstate;
-    _PyThreadState_Swap(gilstate, tstate);
+    _PyThreadState_Swap(tstate->interp->runtime, tstate);
 }
 
 
@@ -965,7 +963,7 @@ _Py_HandlePending(PyThreadState *tstate)
     /* GIL drop request */
     if (_Py_atomic_load_relaxed_int32(&interp_ceval_state->gil_drop_request)) {
         /* Give another thread a chance */
-        if (_PyThreadState_Swap(&runtime->gilstate, NULL) != tstate) {
+        if (_PyThreadState_Swap(runtime, NULL) != tstate) {
             Py_FatalError("tstate mix-up");
         }
         drop_gil(ceval, interp_ceval_state, tstate);
@@ -974,7 +972,7 @@ _Py_HandlePending(PyThreadState *tstate)
 
         take_gil(tstate);
 
-        if (_PyThreadState_Swap(&runtime->gilstate, tstate) != NULL) {
+        if (_PyThreadState_Swap(runtime, tstate) != NULL) {
             Py_FatalError("orphan tstate");
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -581,8 +581,7 @@ PyEval_AcquireThread(PyThreadState *tstate)`
`581`	`581`
`582`	`582`	`take_gil(tstate);`
`583`	`583`
`584`		`- struct _gilstate_runtime_state *gilstate = &tstate->interp->runtime->gilstate;`
`585`		`- if (_PyThreadState_Swap(gilstate, tstate) != NULL) {`
	`584`	`+ if (_PyThreadState_Swap(tstate->interp->runtime, tstate) != NULL) {`
`586`	`585`	`Py_FatalError("non-NULL old thread state");`
`587`	`586`	`}`
`588`	`587`	`}`
`@@ -593,7 +592,7 @@ PyEval_ReleaseThread(PyThreadState *tstate)`
`593`	`592`	`assert(is_tstate_valid(tstate));`
`594`	`593`
`595`	`594`	`_PyRuntimeState *runtime = tstate->interp->runtime;`
`596`		`- PyThreadState *new_tstate = _PyThreadState_Swap(&runtime->gilstate, NULL);`
	`595`	`+ PyThreadState *new_tstate = _PyThreadState_Swap(runtime, NULL);`
`597`	`596`	`if (new_tstate != tstate) {`
`598`	`597`	`Py_FatalError("wrong thread state");`
`599`	`598`	`}`
`@@ -643,7 +642,7 @@ PyThreadState *`
`643`	`642`	`PyEval_SaveThread(void)`
`644`	`643`	`{`
`645`	`644`	`_PyRuntimeState *runtime = &_PyRuntime;`
`646`		`- PyThreadState *tstate = _PyThreadState_Swap(&runtime->gilstate, NULL);`
	`645`	`+ PyThreadState *tstate = _PyThreadState_Swap(runtime, NULL);`
`647`	`646`	`_Py_EnsureTstateNotNULL(tstate);`
`648`	`647`
`649`	`648`	`struct _ceval_runtime_state *ceval = &runtime->ceval;`
`@@ -660,8 +659,7 @@ PyEval_RestoreThread(PyThreadState *tstate)`
`660`	`659`
`661`	`660`	`take_gil(tstate);`
`662`	`661`
`663`		`- struct _gilstate_runtime_state *gilstate = &tstate->interp->runtime->gilstate;`
`664`		`- _PyThreadState_Swap(gilstate, tstate);`
	`662`	`+ _PyThreadState_Swap(tstate->interp->runtime, tstate);`
`665`	`663`	`}`
`666`	`664`
`667`	`665`
`@@ -965,7 +963,7 @@ _Py_HandlePending(PyThreadState *tstate)`
`965`	`963`	`/* GIL drop request */`
`966`	`964`	`if (_Py_atomic_load_relaxed_int32(&interp_ceval_state->gil_drop_request)) {`
`967`	`965`	`/* Give another thread a chance */`
`968`		`- if (_PyThreadState_Swap(&runtime->gilstate, NULL) != tstate) {`
	`966`	`+ if (_PyThreadState_Swap(runtime, NULL) != tstate) {`
`969`	`967`	`Py_FatalError("tstate mix-up");`
`970`	`968`	`}`
`971`	`969`	`drop_gil(ceval, interp_ceval_state, tstate);`
`@@ -974,7 +972,7 @@ _Py_HandlePending(PyThreadState *tstate)`
`974`	`972`
`975`	`973`	`take_gil(tstate);`
`976`	`974`
`977`		`- if (_PyThreadState_Swap(&runtime->gilstate, tstate) != NULL) {`
	`975`	`+ if (_PyThreadState_Swap(runtime, tstate) != NULL) {`
`978`	`976`	`Py_FatalError("orphan tstate");`
`979`	`977`	`}`
`980`	`978`	`}`