Address code review

corona10 · corona10 · commit 8d8fc98b17f3 · 2026-02-18T00:28:38.000+09:00
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -3290,33 +3290,7 @@ _PyDict_FromKeys(PyObject *cls, PyObject *iterable, PyObject *value)
         return NULL;
 
 
-    if (PyDict_CheckExact(d)) {
-        if (PyDict_CheckExact(iterable)) {
-            PyDictObject *mp = (PyDictObject *)d;
-
-            Py_BEGIN_CRITICAL_SECTION2(d, iterable);
-            d = (PyObject *)dict_dict_fromkeys(mp, iterable, value);
-            Py_END_CRITICAL_SECTION2();
-            return d;
-        }
-        else if (PyFrozenDict_CheckExact(iterable)) {
-            PyDictObject *mp = (PyDictObject *)d;
-
-            Py_BEGIN_CRITICAL_SECTION(d);
-            d = (PyObject *)dict_dict_fromkeys(mp, iterable, value);
-            Py_END_CRITICAL_SECTION();
-            return d;
-        }
-        else if (PyAnySet_CheckExact(iterable)) {
-            PyDictObject *mp = (PyDictObject *)d;
-
-            Py_BEGIN_CRITICAL_SECTION2(d, iterable);
-            d = (PyObject *)dict_set_fromkeys(mp, iterable, value);
-            Py_END_CRITICAL_SECTION2();
-            return d;
-        }
-    }
-    else if (PyFrozenDict_CheckExact(d)) {
+    if (PyAnyDict_CheckExact(d)) {
         if (PyDict_CheckExact(iterable)) {
             PyDictObject *mp = (PyDictObject *)d;
 
@@ -3333,7 +3307,7 @@ _PyDict_FromKeys(PyObject *cls, PyObject *iterable, PyObject *value)
         else if (PyAnySet_CheckExact(iterable)) {
             PyDictObject *mp = (PyDictObject *)d;
 
-            Py_BEGIN_CRITICAL_SECTION(iterable);
+            Py_BEGIN_CRITICAL_SECTION(d);
             d = (PyObject *)dict_set_fromkeys(mp, iterable, value);
             Py_END_CRITICAL_SECTION();
             return d;
@@ -3346,20 +3320,7 @@ _PyDict_FromKeys(PyObject *cls, PyObject *iterable, PyObject *value)
         return NULL;
     }
 
-    if (PyDict_CheckExact(d)) {
-        Py_BEGIN_CRITICAL_SECTION(d);
-        while ((key = PyIter_Next(it)) != NULL) {
-            status = setitem_lock_held((PyDictObject *)d, key, value);
-            Py_DECREF(key);
-            if (status < 0) {
-                assert(PyErr_Occurred());
-                goto dict_iter_exit;
-            }
-        }
-dict_iter_exit:;
-        Py_END_CRITICAL_SECTION();
-    }
-    else if (PyFrozenDict_CheckExact(d)) {
+    if (PyAnyDict_CheckExact(d)) {
         while ((key = PyIter_Next(it)) != NULL) {
             status = anydict_setitem_take2((PyDictObject *)d,
                                            key, Py_NewRef(value));
