Fix naming of unsplit -> combined

DinoV · DinoV · commit 4da5161f4301 · 2024-02-02T12:13:38.000-08:00
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -1257,7 +1257,7 @@ insert_into_dictkeys(PyDictKeysObject *keys, PyObject *name)
 
 
 static inline int
-insert_unsplit_dict(PyInterpreterState *interp, PyDictObject *mp,
+insert_combined_dict(PyInterpreterState *interp, PyDictObject *mp,
                     Py_hash_t hash, PyObject *key, PyObject *value, int unicode)
 {
     if (mp->ma_keys->dk_usable <= 0) {
@@ -1304,7 +1304,7 @@ insert_split_dict(PyInterpreterState *interp, PyDictObject *mp,
         assert(!_PyDict_HasSplitTable(mp));
         assert(DK_IS_UNICODE(keys));
         UNLOCK_KEYS(keys);
-        return insert_unsplit_dict(interp, mp, hash, key, value, 1);
+        return insert_combined_dict(interp, mp, hash, key, value, 1);
     }
 
     Py_ssize_t hashpos = find_empty_slot(keys, hash);
@@ -1383,7 +1383,7 @@ insertdict(PyInterpreterState *interp, PyDictObject *mp,
 
         int unicode = DK_IS_UNICODE(mp->ma_keys);
         if (!unicode || !_PyDict_HasSplitTable(mp)) {
-            if (insert_unsplit_dict(interp, mp, hash, key, value, unicode) < 0) {
+            if (insert_combined_dict(interp, mp, hash, key, value, unicode) < 0) {
                 goto Fail;
             }
         } else {
@@ -3526,7 +3526,7 @@ PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *defaultobj)
 
         int unicode = DK_IS_UNICODE(mp->ma_keys);
         if (!unicode || !_PyDict_HasSplitTable(mp)) {
-            if (insert_unsplit_dict(interp, mp, hash, Py_NewRef(key), Py_NewRef(value), unicode) < 0) {
+            if (insert_combined_dict(interp, mp, hash, Py_NewRef(key), Py_NewRef(value), unicode) < 0) {
                 Py_DECREF(key);
                 Py_DECREF(value);
                 return NULL;
