Lock in dictresize, not in callers

DinoV · DinoV · commit 808dd89ce274 · 2024-02-15T15:44:31.000-08:00
diff --git a/Include/cpython/pyatomic_msc.h b/Include/cpython/pyatomic_msc.h
@@ -931,9 +931,9 @@ _Py_atomic_store_ssize_release(Py_ssize_t *obj, Py_ssize_t value)
 #if defined(_M_X64) || defined(_M_IX86)
     *(Py_ssize_t volatile *)obj = value;
 #elif defined(_M_ARM64)
-    __stlr64((unsigned __int64 volatile *)obj, (uintptr_t)value);
+    __stlr64((unsigned __int64 volatile *)obj, (unsigned __int64)value);
 #else
-#  error "no implementation of _Py_atomic_store_int_release"
+#  error "no implementation of _Py_atomic_store_ssize_release"
 #endif
 }
 
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -1339,7 +1339,6 @@ insert_split_dict(PyInterpreterState *interp, PyDictObject *mp,
             return -1;
         }
         assert(!_PyDict_HasSplitTable(mp));
-        assert(DK_IS_UNICODE(keys));
         return insert_combined_dict(interp, mp, hash, key, value);
     }
 
@@ -1598,7 +1597,7 @@ dictresize(PyInterpreterState *interp, PyDictObject *mp,
     Py_ssize_t numentries = mp->ma_used;
 
     if (oldvalues != NULL) {
-        ASSERT_KEYS_LOCKED(oldkeys);
+        LOCK_KEYS(oldkeys);
         PyDictUnicodeEntry *oldentries = DK_UNICODE_ENTRIES(oldkeys);
         /* Convert split table into new combined table.
          * We must incref keys; we can transfer values.
@@ -1629,6 +1628,7 @@ dictresize(PyInterpreterState *interp, PyDictObject *mp,
             }
             build_indices_unicode(mp->ma_keys, newentries, numentries);
         }
+        UNLOCK_KEYS(oldkeys);
         dictkeys_decref(interp, oldkeys);
         mp->ma_values = NULL;
         free_values(oldvalues);
@@ -3987,14 +3987,8 @@ dict_popitem_impl(PyDictObject *self)
     /* Convert split table to combined table */
     if (_PyDict_HasSplitTable(self)) {
         PyDictKeysObject *keys = self->ma_keys;
-        dictkeys_incref(keys);
-        LOCK_KEYS(keys);
-
-        int status = dictresize(interp, self, DK_LOG_SIZE(self->ma_keys), 1);
-        UNLOCK_KEYS(keys);
-        dictkeys_decref(interp, keys);
 
-        if (status < 0) {
+        if (dictresize(interp, self, DK_LOG_SIZE(self->ma_keys), 1) < 0) {
             Py_DECREF(res);
             return NULL;
         }
