review comments

Author: dpdani

Include/internal/pycore_critical_section.h

@@ -196,10 +196,9 @@ _PyCriticalSection2_Begin(PyThreadState *tstate, PyCriticalSection2 *c, PyObject
 static inline void
 _PyCriticalSection2_End(PyThreadState *tstate, PyCriticalSection2 *c)
 {
-    // if mutex1 is NULL, we used the fast path in
-    // _PyCriticalSection_BeginSlow for mutexes that are already held,
-    // which should only happen when mutex1 and mutex2 were the same mutex,
-    // and mutex2 should also be NULL.
+    // if mutex1 is NULL, we used the fast path in either
+    // _PyCriticalSection_BeginSlow or _PyCriticalSection2_BeginSlow for mutexes
+    // that are already held, and mutex2 should also be NULL.
     if (c->_cs_base._cs_mutex == NULL) {
         assert(c->_cs_mutex2 == NULL);
         return;

Python/critical_section.c

@@ -78,8 +78,9 @@ _PyCriticalSection2_BeginSlow(PyThreadState *tstate, PyCriticalSection2 *c, PyMu
         tstate->critical_section & _Py_CRITICAL_SECTION_TWO_MUTEXES) {
         PyCriticalSection2 *prev2 = (PyCriticalSection2 *)
             untag_critical_section(tstate->critical_section);
-        assert(m1 < m2);
-        assert(prev2->_cs_base._cs_mutex < prev2->_cs_mutex2);
+        assert((uintptr_t)m1 < (uintptr_t)m2);
+        assert((uintptr_t)prev2->_cs_base._cs_mutex <
+            (uintptr_t)prev2->_cs_mutex2);
         if (prev2->_cs_base._cs_mutex == m1 && prev2->_cs_mutex2 == m2) {
             c->_cs_base._cs_mutex = NULL;
             c->_cs_mutex2 = NULL;