Remove _PyRuntimeState_GetThreadState.

markshannon · markshannon · commit 6c6770df9f59 · 2020-03-24T14:54:35.000Z
diff --git a/Include/internal/pycore_pystate.h b/Include/internal/pycore_pystate.h
@@ -328,10 +328,6 @@ _Py_ThreadCanHandlePendingCalls(void)
 /* Variable and macro for in-line access to current thread
    and interpreter state */
 
-static inline PyThreadState* _PyRuntimeState_GetThreadState(_PyRuntimeState *runtime) {
-    return (PyThreadState*)_Py_atomic_load_relaxed(&runtime->gilstate.tstate_current);
-}
-
 /* Get the current Python thread state.
 
    Efficient macro reading directly the 'gilstate.tstate_current' atomic
@@ -341,7 +337,7 @@ static inline PyThreadState* _PyRuntimeState_GetThreadState(_PyRuntimeState *run
    The caller must hold the GIL.
 
    See also PyThreadState_Get() and PyThreadState_GET(). */
-#define _PyThreadState_GET() _PyRuntimeState_GetThreadState(&_PyRuntime)
+#define _PyThreadState_GET() ((PyThreadState*)_Py_atomic_load_relaxed(&_PyRuntime.gilstate.tstate_current))
 
 /* Redefine PyThreadState_GET() as an alias to _PyThreadState_GET() */
 #undef PyThreadState_GET
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -355,8 +355,7 @@ _PyEval_Fini(void)
 void
 PyEval_AcquireLock(void)
 {
-    _PyRuntimeState *runtime = &_PyRuntime;
-    PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);
+    PyThreadState *tstate = _PyThreadState_GET();
     ensure_tstate_not_null(__func__, tstate);
 
     take_gil(tstate);
@@ -366,7 +365,7 @@ void
 PyEval_ReleaseLock(void)
 {
     _PyRuntimeState *runtime = &_PyRuntime;
-    PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);
+    PyThreadState *tstate = _PyThreadState_GET();
     /* This function must succeed when the current thread state is NULL.
        We therefore avoid PyThreadState_Get() which dumps a fatal error
        in debug mode. */
@@ -419,7 +418,7 @@ _PyEval_ReInitThreads(_PyRuntimeState *runtime)
         return;
     }
     recreate_gil(gil);
-    PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);
+    PyThreadState *tstate = _PyThreadState_GET();
     ensure_tstate_not_null(__func__, tstate);
 
     take_gil(tstate);
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -1108,8 +1108,7 @@ _Py_InitializeMain(void)
     if (_PyStatus_EXCEPTION(status)) {
         return status;
     }
-    _PyRuntimeState *runtime = &_PyRuntime;
-    PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);
+    PyThreadState *tstate = _PyThreadState_GET();
     return pyinit_main(tstate);
 }
 
@@ -1337,7 +1336,7 @@ Py_FinalizeEx(void)
     }
 
     /* Get current thread state and interpreter pointer */
-    PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);
+    PyThreadState *tstate = _PyThreadState_GET();
     PyInterpreterState *interp = tstate->interp;
 
     // Wrap up existing "threading"-module-created, non-daemon threads.
@@ -2207,7 +2206,7 @@ fatal_error(const char *prefix, const char *msg, int status)
     _PyRuntimeState *runtime = &_PyRuntime;
     fatal_error_dump_runtime(stream, runtime);
 
-    PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);
+    PyThreadState *tstate = _PyThreadState_GET();
     PyInterpreterState *interp = NULL;
     if (tstate != NULL) {
         interp = tstate->interp;
diff --git a/Python/pystate.c b/Python/pystate.c
@@ -1013,7 +1013,7 @@ int
 PyThreadState_SetAsyncExc(unsigned long id, PyObject *exc)
 {
     _PyRuntimeState *runtime = &_PyRuntime;
-    PyInterpreterState *interp = _PyRuntimeState_GetThreadState(runtime)->interp;
+    PyInterpreterState *interp = _PyThreadState_GET()->interp;
 
     /* Although the GIL is held, a few C API functions can be called
      * without the GIL held, and in particular some that create and
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -288,7 +288,7 @@ _PySys_ClearAuditHooks(void)
 {
     /* Must be finalizing to clear hooks */
     _PyRuntimeState *runtime = &_PyRuntime;
-    PyThreadState *ts = _PyRuntimeState_GetThreadState(runtime);
+    PyThreadState *ts = _PyThreadState_GET();
     PyThreadState *finalizing = _PyRuntimeState_GetFinalizing(runtime);
     assert(!ts || finalizing == ts);
     if (!ts || finalizing != ts) {
@@ -318,7 +318,7 @@ int
 PySys_AddAuditHook(Py_AuditHookFunction hook, void *userData)
 {
     _PyRuntimeState *runtime = &_PyRuntime;
-    PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);
+    PyThreadState *tstate = _PyThreadState_GET();
 
     /* Invoke existing audit hooks to allow them an opportunity to abort. */
     /* Cannot invoke hooks until we are initialized */

Original file line number	Diff line number	Diff line change
`@@ -1013,7 +1013,7 @@ int`
`1013`	`1013`	`PyThreadState_SetAsyncExc(unsigned long id, PyObject *exc)`
`1014`	`1014`	`{`
`1015`	`1015`	`_PyRuntimeState *runtime = &_PyRuntime;`
`1016`		`- PyInterpreterState *interp = _PyRuntimeState_GetThreadState(runtime)->interp;`
	`1016`	`+ PyInterpreterState *interp = _PyThreadState_GET()->interp;`
`1017`	`1017`
`1018`	`1018`	`/* Although the GIL is held, a few C API functions can be called`
`1019`	`1019`	`* without the GIL held, and in particular some that create and`