fix _PyCriticalSection_WarnIfNotHeld further

Author: Changaco

Include/internal/pycore_critical_section.h

@@ -95,7 +95,7 @@ _PyCriticalSection2_BeginSlow(PyThreadState *tstate, PyCriticalSection2 *c, PyMu
 PyAPI_FUNC(void)
 _PyCriticalSection_SuspendAll(PyThreadState *tstate);
 
-PyAPI_FUNC(void)
+int
 _PyCriticalSection_WarnIfNotHeld(PyObject *op, const char *message);
 
 #ifdef Py_GIL_DISABLED

Modules/_collectionsmodule.c

@@ -2263,12 +2263,11 @@ PyDoc_STRVAR(defdict_missing_doc,
 static PyObject *
 defdict_missing(PyObject *op, PyObject *key)
 {
-    _PyCriticalSection_WarnIfNotHeld(
-        op,
+    if (_PyCriticalSection_WarnIfNotHeld(op,
         "the defaultdict.__missing__ method should not be called directly; "
         "use dd.pop(key, None) to safely trigger a reset to a default value "
-        "the next time key is accessed"
-    );
+        "the next time key is accessed") < 0)
+        return NULL;
     defdictobject *dd = defdictobject_CAST(op);
     PyObject *factory = dd->default_factory;
     PyObject *value;

Python/critical_section.c

@@ -202,7 +202,7 @@ PyCriticalSection2_End(PyCriticalSection2 *c)
 #endif
 }
 
-void
+int
 _PyCriticalSection_WarnIfNotHeld(PyObject *op, const char *message)
 {
 #ifdef Py_GIL_DISABLED
@@ -212,12 +212,13 @@ _PyCriticalSection_WarnIfNotHeld(PyObject *op, const char *message)
     if (prev & _Py_CRITICAL_SECTION_TWO_MUTEXES) {
         PyCriticalSection2 *cs = (PyCriticalSection2 *)(prev & ~_Py_CRITICAL_SECTION_MASK);
         if (cs == NULL || (cs->_cs_base._cs_mutex != mutex && cs->_cs_mutex2 != mutex))
-            PyErr_WarnEx(NULL, message, 2);
+            return PyErr_WarnEx(NULL, message, 2);
     }
     else {
         PyCriticalSection *cs = (PyCriticalSection *)(prev & ~_Py_CRITICAL_SECTION_MASK);
         if (cs == NULL || cs->_cs_mutex != mutex)
-            PyErr_WarnEx(NULL, message, 2);
+            return PyErr_WarnEx(NULL, message, 2);
     }
 #endif
+    return 0;
 }