mirror of
https://github.com/python/cpython.git
synced 2025-07-23 11:15:24 +00:00
merge 3.4
This commit is contained in:
commit
89cef795eb
1 changed files with 2 additions and 3 deletions
|
@ -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 */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue