deadlock

Author: albertedwardson

Objects/codeobject.c

@@ -206,20 +206,16 @@ static int
 intern_constants(PyObject *tuple, int *modified)
 {
     PyInterpreterState *interp = _PyInterpreterState_GET();
-    PyObject *interned_dict = _Py_INTERP_CACHED_OBJECT(interp, interned_strings);
     // copypaste from unicodeobject.c
-#ifdef Py_GIL_DISABLED
-#  define INTERN_MUTEX &_Py_INTERP_CACHED_OBJECT(interp, interned_mutex)
-#endif
-    FT_MUTEX_LOCK(INTERN_MUTEX);
+    PyObject *interned_dict = _Py_INTERP_CACHED_OBJECT(interp, interned_strings);
+    Py_BEGIN_CRITICAL_SECTION(interned_dict);
     Py_INCREF(interned_dict);
     for (Py_ssize_t i = PyTuple_GET_SIZE(tuple); --i >= 0; ) {
         PyObject *v = PyTuple_GET_ITEM(tuple, i);
         if (PyUnicode_CheckExact(v) && PyUnicode_GET_LENGTH(v) > 1) {
             if (PyUnicode_CHECK_INTERNED(v) != 0) {
                 continue;
             }
-            //
             PyObject *interned = PyDict_GetItemWithError(interned_dict, v);
             if (interned == NULL && PyErr_Occurred()) {
                 goto error;
@@ -331,12 +327,12 @@ intern_constants(PyObject *tuple, int *modified)
         }
 #endif
     }
-    FT_MUTEX_UNLOCK(INTERN_MUTEX);
+    Py_END_CRITICAL_SECTION();
     Py_DECREF(interned_dict);
     return 0;
 
 error:
-    FT_MUTEX_UNLOCK(INTERN_MUTEX);
+    Py_END_CRITICAL_SECTION();
     Py_DECREF(interned_dict);
     return -1;
 }