Skip to content

C
cpython
Kaydet (Commit) 95d75194 authored tarafından Benjamin Peterson's avatar Benjamin Peterson
Dosyalara gözat
Seçenekler

remove extra call to tstate_delete_common (merge artifact)

üst 9db28166
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
Python/pystate.c
Dosyayı görüntüle @ 95d75194
...@@ -423,6 +423,8 @@ PyThreadState_DeleteCurrent() ...@@ -423,6 +423,8 @@ PyThreadState_DeleteCurrent()
Py_FatalError( Py_FatalError(
"PyThreadState_DeleteCurrent: no current tstate"); "PyThreadState_DeleteCurrent: no current tstate");
_Py_atomic_store_relaxed(&_PyThreadState_Current, NULL); _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 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 or we're the main thread. The main thread will do this for us. Not calling
...@@ -431,9 +433,6 @@ PyThreadState_DeleteCurrent() ...@@ -431,9 +433,6 @@ PyThreadState_DeleteCurrent()
*/ */
if (!_Py_Finalizing || _Py_Finalizing == tstate) if (!_Py_Finalizing || _Py_Finalizing == tstate)
tstate_delete_common(tstate); tstate_delete_common(tstate);
if (autoInterpreterState && PyThread_get_key_value(autoTLSkey) == tstate)
PyThread_delete_key_value(autoTLSkey);
tstate_delete_common(tstate);
PyEval_ReleaseLock(); PyEval_ReleaseLock();
} }
#endif /* WITH_THREAD */ #endif /* WITH_THREAD */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment