]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-116664: Fix unused var warnings in _warnings.c in non-free-threaded builds (#117373)
authorErlend E. Aasland <erlend@python.org>
Fri, 29 Mar 2024 17:26:06 +0000 (18:26 +0100)
committerGitHub <noreply@github.com>
Fri, 29 Mar 2024 17:26:06 +0000 (17:26 +0000)
The warnings were introduced by commit c1712ef06.

Python/_warnings.c

index 66a460e2a2c5099cfc5c89badac9c79bf0e1dd16..ac3d3cc2d1246bdf93c263ba62843180417be9ed 100644 (file)
@@ -994,8 +994,10 @@ do_warn(PyObject *message, PyObject *category, Py_ssize_t stack_level,
                        &filename, &lineno, &module, &registry))
         return NULL;
 
+#ifdef Py_GIL_DISABLED
     WarningsState *st = warnings_get_state(tstate->interp);
     assert(st != NULL);
+#endif
 
     Py_BEGIN_CRITICAL_SECTION_MUT(&st->mutex);
     res = warn_explicit(tstate, category, message, filename, lineno, module, registry,
@@ -1149,8 +1151,10 @@ warnings_warn_explicit_impl(PyObject *module, PyObject *message,
         }
     }
 
+#ifdef Py_GIL_DISABLED
     WarningsState *st = warnings_get_state(tstate->interp);
     assert(st != NULL);
+#endif
 
     Py_BEGIN_CRITICAL_SECTION_MUT(&st->mutex);
     returned = warn_explicit(tstate, category, message, filename, lineno,
@@ -1296,8 +1300,10 @@ PyErr_WarnExplicitObject(PyObject *category, PyObject *message,
         return -1;
     }
 
+#ifdef Py_GIL_DISABLED
     WarningsState *st = warnings_get_state(tstate->interp);
     assert(st != NULL);
+#endif
 
     Py_BEGIN_CRITICAL_SECTION_MUT(&st->mutex);
     res = warn_explicit(tstate, category, message, filename, lineno,
@@ -1367,8 +1373,10 @@ PyErr_WarnExplicitFormat(PyObject *category,
         PyObject *res;
         PyThreadState *tstate = get_current_tstate();
         if (tstate != NULL) {
+#ifdef Py_GIL_DISABLED
             WarningsState *st = warnings_get_state(tstate->interp);
             assert(st != NULL);
+#endif
 
             Py_BEGIN_CRITICAL_SECTION_MUT(&st->mutex);
             res = warn_explicit(tstate, category, message, filename, lineno,