From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 17 Jun 2014 07:34:14 +0000 (-0700)
Subject: revert tstate_delete_common, since it's pretty much wrong
X-Git-Tag: v2.7.8~37^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3232384e1e5656d7a9f8f9acc7fd64697cb2226b;p=python

revert tstate_delete_common, since it's pretty much wrong
---

diff --git a/Python/pystate.c b/Python/pystate.c
index 7584ea0d83..eb992c1780 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -315,16 +315,9 @@ PyThreadState_DeleteCurrent()
         Py_FatalError(
             "PyThreadState_DeleteCurrent: no current tstate");
     _PyThreadState_Current = NULL;
-    /*
-      Only call tstate_delete_common to have the tstate if we're not finalizing
-      or we're the main thread. The main thread will do this for us. Not calling
-      tstate_delete_common means we won't lock the interpreter head lock,
-      avoiding a possible deadlock with the GIL.
-    */
-    if (!_Py_Finalizing || _Py_Finalizing == tstate)
-        tstate_delete_common(tstate);
     if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate)
         PyThread_delete_key_value(autoTLSkey);
+    tstate_delete_common(tstate);
     PyEval_ReleaseLock();
 }
 #endif /* WITH_THREAD */