From 95d75194ac2a96bef077d8ac6c5879c14ca8bb08 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 16 Jun 2014 23:49:02 -0700 Subject: remove extra call to tstate_delete_common (merge artifact) --- Python/pystate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Python/pystate.c b/Python/pystate.c index 8c1fad2..7afca17 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -423,6 +423,8 @@ PyThreadState_DeleteCurrent() Py_FatalError( "PyThreadState_DeleteCurrent: no current tstate"); _Py_atomic_store_relaxed(&_PyThreadState_Current, NULL); + if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate) + PyThread_delete_key_value(autoTLSkey); /* 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 @@ -431,9 +433,6 @@ PyThreadState_DeleteCurrent() */ 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 */ -- cgit v0.12