Fix pystate.c.

ericsnowcurrently · ericsnowcurrently · commit 3db400735ac2 · 2023-04-07T10:51:35.000-06:00
diff --git a/Include/internal/pycore_pystate.h b/Include/internal/pycore_pystate.h
@@ -65,7 +65,7 @@ _Py_ThreadCanHandlePendingCalls(void)
    and interpreter state */
 
 #if defined(HAVE_THREAD_LOCAL) && !defined(Py_BUILD_CORE_MODULE)
-extern thread_local PyThreadState *_Py_tss_tstate;
+extern _Py_thread_local PyThreadState *_Py_tss_tstate;
 #endif
 PyAPI_DATA(PyThreadState *) _PyThreadState_GetCurrent(void);
 
diff --git a/Python/pystate.c b/Python/pystate.c
@@ -61,38 +61,55 @@ extern "C" {
  */
 
 
-thread_local PyThreadState *_Py_tss_tstate = NULL;
-
-PyThreadState *
-_PyThreadState_GetCurrent(void)
-{
-    return _Py_tss_tstate;
-}
+#ifdef HAVE_THREAD_LOCAL
+_Py_thread_local PyThreadState *_Py_tss_tstate = NULL;
+#endif
 
 static inline PyThreadState *
 current_fast_get(_PyRuntimeState *Py_UNUSED(runtime))
 {
+#ifdef HAVE_THREAD_LOCAL
     return _Py_tss_tstate;
+#else
+    // XXX Fall back to the PyThread_tss_*() API.
+#  error "no supported thread-local variable storage classifier"
+#endif
 }
 
 static inline void
 current_fast_set(_PyRuntimeState *Py_UNUSED(runtime), PyThreadState *tstate)
 {
     assert(tstate != NULL);
+#ifdef HAVE_THREAD_LOCAL
     _Py_tss_tstate = tstate;
+#else
+    // XXX Fall back to the PyThread_tss_*() API.
+#  error "no supported thread-local variable storage classifier"
+#endif
 }
 
 static inline void
 current_fast_clear(_PyRuntimeState *Py_UNUSED(runtime))
 {
+#ifdef HAVE_THREAD_LOCAL
     _Py_tss_tstate = NULL;
+#else
+    // XXX Fall back to the PyThread_tss_*() API.
+#  error "no supported thread-local variable storage classifier"
+#endif
 }
 
 #define tstate_verify_not_active(tstate) \
     if (tstate == current_fast_get((tstate)->interp->runtime)) { \
         _Py_FatalErrorFormat(__func__, "tstate %p is still current", tstate); \
     }
 
+PyThreadState *
+_PyThreadState_GetCurrent(void)
+{
+    return current_fast_get(&_PyRuntime);
+}
+
 
 //------------------------------------------------
 // the thread state bound to the current OS thread
