[3.9] bpo-40826: PyOS_InterruptOccurred() requires GIL (GH-20578) (GH-20618)
* bpo-40826: Add _Py_EnsureTstateNotNULL() macro (GH-20571)
Add _Py_EnsureTstateNotNULL(tstate) macro: call Py_FatalError() if
tstate is NULL, the error message contains the current function name.
(cherry picked from commit 3026cad59b87751a9215111776cac8e819458fce)
* bpo-40826: PyOS_InterruptOccurred() requires GIL (GH-20578)
PyOS_InterruptOccurred() now fails with a fatal error if it is called
with the GIL released.
(cherry picked from commit cbe129692293251e7fbcea9ff0d822824d90c140)
diff --git a/Python/ceval.c b/Python/ceval.c
index ff67c83..3392cd0 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -240,13 +240,13 @@
#endif
#include "ceval_gil.h"
-static void
-ensure_tstate_not_null(const char *func, PyThreadState *tstate)
+void _Py_NO_RETURN
+_Py_FatalError_TstateNULL(const char *func)
{
- if (tstate == NULL) {
- _Py_FatalErrorFunc(func,
- "current thread state is NULL (released GIL?)");
- }
+ _Py_FatalErrorFunc(func,
+ "the function must be called with the GIL held, "
+ "but the GIL is released "
+ "(the current Python thread state is NULL)");
}
@@ -346,7 +346,7 @@
{
_PyRuntimeState *runtime = &_PyRuntime;
PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);
- ensure_tstate_not_null(__func__, tstate);
+ _Py_EnsureTstateNotNULL(tstate);
take_gil(tstate);
}
@@ -375,7 +375,7 @@
void
PyEval_AcquireThread(PyThreadState *tstate)
{
- ensure_tstate_not_null(__func__, tstate);
+ _Py_EnsureTstateNotNULL(tstate);
take_gil(tstate);
@@ -410,7 +410,7 @@
_PyEval_ReInitThreads(_PyRuntimeState *runtime)
{
PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);
- ensure_tstate_not_null(__func__, tstate);
+ _Py_EnsureTstateNotNULL(tstate);
struct _gil_runtime_state *gil = &runtime->ceval.gil;
if (!gil_created(gil)) {
@@ -445,7 +445,7 @@
{
_PyRuntimeState *runtime = &_PyRuntime;
PyThreadState *tstate = _PyThreadState_Swap(&runtime->gilstate, NULL);
- ensure_tstate_not_null(__func__, tstate);
+ _Py_EnsureTstateNotNULL(tstate);
struct _ceval_runtime_state *ceval = &runtime->ceval;
struct _ceval_state *ceval2 = &tstate->interp->ceval;
@@ -457,7 +457,7 @@
void
PyEval_RestoreThread(PyThreadState *tstate)
{
- ensure_tstate_not_null(__func__, tstate);
+ _Py_EnsureTstateNotNULL(tstate);
take_gil(tstate);
@@ -889,7 +889,7 @@
PyObject* _Py_HOT_FUNCTION
_PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
{
- ensure_tstate_not_null(__func__, tstate);
+ _Py_EnsureTstateNotNULL(tstate);
#ifdef DXPAIRS
int lastopcode = 0;
diff --git a/Python/errors.c b/Python/errors.c
index 70365aa..5d17256 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -1426,7 +1426,7 @@
_PyErr_WriteUnraisableMsg(const char *err_msg_str, PyObject *obj)
{
PyThreadState *tstate = _PyThreadState_GET();
- assert(tstate != NULL);
+ _Py_EnsureTstateNotNULL(tstate);
PyObject *err_msg = NULL;
PyObject *exc_type, *exc_value, *exc_tb;
diff --git a/Python/pystate.c b/Python/pystate.c
index dd95750..071b976 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -39,16 +39,6 @@
_Py_atomic_store_relaxed(&(gilstate)->tstate_current, \
(uintptr_t)(value))
-static void
-ensure_tstate_not_null(const char *func, PyThreadState *tstate)
-{
- if (tstate == NULL) {
- _Py_FatalErrorFunc(func,
- "current thread state is NULL (released GIL?)");
- }
-}
-
-
/* Forward declarations */
static PyThreadState *_PyGILState_GetThisThreadState(struct _gilstate_runtime_state *gilstate);
static void _PyThreadState_Delete(PyThreadState *tstate, int check_current);
@@ -431,7 +421,7 @@
PyInterpreterState_Get(void)
{
PyThreadState *tstate = _PyThreadState_GET();
- ensure_tstate_not_null(__func__, tstate);
+ _Py_EnsureTstateNotNULL(tstate);
PyInterpreterState *interp = tstate->interp;
if (interp == NULL) {
Py_FatalError("no current interpreter");
@@ -846,7 +836,7 @@
tstate_delete_common(PyThreadState *tstate,
struct _gilstate_runtime_state *gilstate)
{
- ensure_tstate_not_null(__func__, tstate);
+ _Py_EnsureTstateNotNULL(tstate);
PyInterpreterState *interp = tstate->interp;
if (interp == NULL) {
Py_FatalError("NULL interpreter");
@@ -897,7 +887,7 @@
void
_PyThreadState_DeleteCurrent(PyThreadState *tstate)
{
- ensure_tstate_not_null(__func__, tstate);
+ _Py_EnsureTstateNotNULL(tstate);
struct _gilstate_runtime_state *gilstate = &tstate->interp->runtime->gilstate;
tstate_delete_common(tstate, gilstate);
_PyRuntimeGILState_SetThreadState(gilstate, NULL);
@@ -967,7 +957,7 @@
PyThreadState_Get(void)
{
PyThreadState *tstate = _PyThreadState_GET();
- ensure_tstate_not_null(__func__, tstate);
+ _Py_EnsureTstateNotNULL(tstate);
return tstate;
}
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 914beb7..e3fe143 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -457,7 +457,7 @@
sys_audit(PyObject *self, PyObject *const *args, Py_ssize_t argc)
{
PyThreadState *tstate = _PyThreadState_GET();
- assert(tstate != NULL);
+ _Py_EnsureTstateNotNULL(tstate);
if (argc == 0) {
_PyErr_SetString(tstate, PyExc_TypeError,