Fix merge conflict artifact.

ZeroIntensity · ZeroIntensity · commit 8c12e6ce6a00 · 2025-09-17T12:00:42.000-04:00
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -2108,6 +2108,7 @@ make_pre_finalization_calls(PyThreadState *tstate)
         _PyEval_StartTheWorldAll(interp->runtime);
         PyMutex_Unlock(&interp->ceval.pending.mutex);
     }
+    assert(PyMutex_IsLocked(&interp->ceval.pending.mutex));
     ASSERT_WORLD_STOPPED(interp);
 }
 
@@ -2538,8 +2539,6 @@ Py_EndInterpreter(PyThreadState *tstate)
     /* Remaining daemon threads will automatically exit
        when they attempt to take the GIL (ex: PyEval_RestoreThread()). */
     _PyInterpreterState_SetFinalizing(interp, tstate);
-    _PyEval_StartTheWorldAll(interp->runtime);
-    PyMutex_Unlock(&interp->ceval.pending.mutex);
 
     PyThreadState *list = _PyThreadState_RemoveExcept(tstate);
     for (PyThreadState *p = list; p != NULL; p = p->next) {

Original file line number	Diff line number	Diff line change
`@@ -2108,6 +2108,7 @@ make_pre_finalization_calls(PyThreadState *tstate)`
`2108`	`2108`	`_PyEval_StartTheWorldAll(interp->runtime);`
`2109`	`2109`	`PyMutex_Unlock(&interp->ceval.pending.mutex);`
`2110`	`2110`	`}`
	`2111`	`+ assert(PyMutex_IsLocked(&interp->ceval.pending.mutex));`
`2111`	`2112`	`ASSERT_WORLD_STOPPED(interp);`
`2112`	`2113`	`}`
`2113`	`2114`
`@@ -2538,8 +2539,6 @@ Py_EndInterpreter(PyThreadState *tstate)`
`2538`	`2539`	`/* Remaining daemon threads will automatically exit`
`2539`	`2540`	`when they attempt to take the GIL (ex: PyEval_RestoreThread()). */`
`2540`	`2541`	`_PyInterpreterState_SetFinalizing(interp, tstate);`
`2541`		`- _PyEval_StartTheWorldAll(interp->runtime);`
`2542`		`- PyMutex_Unlock(&interp->ceval.pending.mutex);`
`2543`	`2542`
`2544`	`2543`	`PyThreadState *list = _PyThreadState_RemoveExcept(tstate);`
`2545`	`2544`	`for (PyThreadState *p = list; p != NULL; p = p->next) {`