gh-117511: Make PyMutex public in the non-limited API

Include/cpython/lock.h

@@ -30,32 +30,34 @@ typedef struct PyMutex {
     uint8_t _bits;  // (private)
 } PyMutex;
 
-// (private) slow path for locking the mutex
-PyAPI_FUNC(void) _PyMutex_LockSlow(PyMutex *m);
+// exported function for locking the mutex
+PyAPI_FUNC(void) PyMutex_Lock(PyMutex *m);
 
-// (private) slow path for unlocking the mutex
-PyAPI_FUNC(void) _PyMutex_UnlockSlow(PyMutex *m);
+// exported function for unlocking the mutex
+PyAPI_FUNC(void) PyMutex_Unlock(PyMutex *m);
 
 // Locks the mutex.
 //
 // If the mutex is currently locked, the calling thread will be parked until
 // the mutex is unlocked. If the current thread holds the GIL, then the GIL
 // will be released while the thread is parked.
 static inline void
-PyMutex_Lock(PyMutex *m)
+_PyMutex_Lock(PyMutex *m)
 {
     uint8_t expected = _Py_UNLOCKED;
     if (!_Py_atomic_compare_exchange_uint8(&m->_bits, &expected, _Py_LOCKED)) {
-        _PyMutex_LockSlow(m);
+        PyMutex_Lock(m);
     }
 }
+#define PyMutex_Lock _PyMutex_Lock
 
 // Unlocks the mutex.
 static inline void
-PyMutex_Unlock(PyMutex *m)
+_PyMutex_Unlock(PyMutex *m)
 {
     uint8_t expected = _Py_LOCKED;
     if (!_Py_atomic_compare_exchange_uint8(&m->_bits, &expected, _Py_UNLOCKED)) {
-        _PyMutex_UnlockSlow(m);
+        PyMutex_Unlock(m);
     }
 }
+#define PyMutex_Unlock _PyMutex_Unlock

Python/critical_section.c

@@ -14,7 +14,7 @@ _PyCriticalSection_BeginSlow(_PyCriticalSection *c, PyMutex *m)
     c->prev = (uintptr_t)tstate->critical_section;
     tstate->critical_section = (uintptr_t)c;
 
-    _PyMutex_LockSlow(m);
+    PyMutex_Lock(m);
     c->mutex = m;
 }
 

Python/lock.c

@@ -47,8 +47,9 @@ _Py_yield(void)
 #endif
 }
 
+#undef PyMutex_Lock
 void
-_PyMutex_LockSlow(PyMutex *m)
+PyMutex_Lock(PyMutex *m)
 {
     _PyMutex_LockTimed(m, -1, _PY_LOCK_DETACH);
 }
@@ -182,8 +183,9 @@ _PyMutex_TryUnlock(PyMutex *m)
     }
 }
 
+#undef PyMutex_Unlock
 void
-_PyMutex_UnlockSlow(PyMutex *m)
+PyMutex_Unlock(PyMutex *m)
 {
     if (_PyMutex_TryUnlock(m) < 0) {
         Py_FatalError("unlocking mutex that is not locked");