From: Sam Gross <colesbury@gmail.com>
Date: Fri, 29 Mar 2024 22:58:08 +0000 (-0400)
Subject: gh-117303: Don't detach in `PyThreadState_DeleteCurrent()` (#117304)
X-Git-Tag: v3.13.0a6~99
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bfc57d43d8766120ba0c8f3f6d7b2ac681a81d8a;p=thirdparty%2FPython%2Fcpython.git

gh-117303: Don't detach in `PyThreadState_DeleteCurrent()` (#117304)

This fixes a crash in `test_threading.test_reinit_tls_after_fork()` when
running with the GIL disabled. We already properly handle the case where
the thread state is `_Py_THREAD_ATTACHED` in `tstate_delete_common()` --
we just need to remove an assertion.

Keeping the thread attached means that a stop-the-world pause, such as
for a `fork()`, won't commence until we remove our thread state from the
interpreter's linked list. This prevents a crash when the child process
tries to clean up the dead thread states.
---

diff --git a/Python/pystate.c b/Python/pystate.c
index 8bec72779b2c..925d1cff866f 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -1660,7 +1660,6 @@ static void
 tstate_delete_common(PyThreadState *tstate)
 {
     assert(tstate->_status.cleared && !tstate->_status.finalized);
-    assert(tstate->state != _Py_THREAD_ATTACHED);
     tstate_verify_not_active(tstate);
     assert(!_PyThreadState_IsRunningMain(tstate));
 
@@ -1740,7 +1739,6 @@ _PyThreadState_DeleteCurrent(PyThreadState *tstate)
 #ifdef Py_GIL_DISABLED
     _Py_qsbr_detach(((_PyThreadStateImpl *)tstate)->qsbr);
 #endif
-    tstate_set_detached(tstate, _Py_THREAD_DETACHED);
     current_fast_clear(tstate->interp->runtime);
     tstate_delete_common(tstate);
     _PyEval_ReleaseLock(tstate->interp, NULL);