GH-110455: Guard assert(tstate->thread_id > 0) with #ifndef HAVE_PTHREAD_STUBS (GH-110487)

brettcannon · web-flow · commit 5fd8821cf8eb · 2023-10-06T16:12:19.000-07:00
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-06-12-00-43.gh-issue-110455.8BjNGg.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-06-12-00-43.gh-issue-110455.8BjNGg.rst
@@ -0,0 +1,3 @@
+Guard ``assert(tstate->thread_id > 0)`` with ``#ifndef HAVE_PTHREAD_STUBS``.
+This allows for for pydebug builds to work under WASI which (currently)
+lacks thread support.
diff --git a/Python/pystate.c b/Python/pystate.c
@@ -263,10 +263,10 @@ static void
 unbind_tstate(PyThreadState *tstate)
 {
     assert(tstate != NULL);
-    // XXX assert(tstate_is_alive(tstate));
     assert(tstate_is_bound(tstate));
-    // XXX assert(!tstate->_status.active);
+#ifndef HAVE_PTHREAD_STUBS
     assert(tstate->thread_id > 0);
+#endif
 #ifdef PY_HAVE_THREAD_NATIVE_ID
     assert(tstate->native_thread_id > 0);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Guard ``assert(tstate->thread_id > 0)`` with ``#ifndef HAVE_PTHREAD_STUBS``.
	`2`	`+This allows for for pydebug builds to work under WASI which (currently)`
	`3`	`+lacks thread support.`