apply review comments

python · iritkatriel · Apr 10, 2025 · Apr 10, 2025 · Apr 11, 2025 · Apr 12, 2025
commit d5dc19b797c56111f06294ff190f69397bdcacd3
diff --git a/Include/internal/pycore_dict.h b/Include/internal/pycore_dict.h
@@ -44,6 +44,8 @@ extern int _PyDict_Next(
 
 extern int _PyDict_HasOnlyStringKeys(PyObject *mp);
 
+extern PyObject *_PyDict_Subscript(PyObject *self, PyObject *key);
+
 // Export for '_ctypes' shared extension
 PyAPI_FUNC(Py_ssize_t) _PyDict_SizeOf(PyDictObject *);
 

diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
@@ -3388,8 +3388,8 @@ dict_length(PyObject *self)
     return FT_ATOMIC_LOAD_SSIZE_RELAXED(((PyDictObject *)self)->ma_used);
 }
 
-static PyObject *
-dict_subscript(PyObject *self, PyObject *key)
+PyObject *
+_PyDict_Subscript(PyObject *self, PyObject *key)
 {
     PyDictObject *mp = (PyDictObject *)self;
     Py_ssize_t ix;
@@ -3434,7 +3434,7 @@ dict_ass_sub(PyObject *mp, PyObject *v, PyObject *w)
 
 static PyMappingMethods dict_as_mapping = {
     dict_length, /*mp_length*/
-    dict_subscript, /*mp_subscript*/
+    _PyDict_Subscript, /*mp_subscript*/
     dict_ass_sub, /*mp_ass_subscript*/
 };
 
@@ -4712,7 +4712,7 @@ In either case, this is followed by: for k in F:  D[k] = F[k]");
 
 static PyMethodDef mapp_methods[] = {
     DICT___CONTAINS___METHODDEF
-    {"__getitem__",     dict_subscript,                 METH_O | METH_COEXIST,
+    {"__getitem__",     _PyDict_Subscript,                 METH_O | METH_COEXIST,
      getitem__doc__},
     DICT___SIZEOF___METHODDEF
     DICT_GET_METHODDEF

@@ -961,7 +961,9 @@ dummy_func(
 
         op(_GUARD_NOS_DICT_NOT_EXACT, (nos, unused -- nos, unused)) {
             PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
-            EXIT_IF(!PyDict_Check(o));
+            DEOPT_IF(!Py_TYPE(o)->tp_as_mapping);
+            DEOPT_IF(Py_TYPE(o)->tp_as_mapping->mp_subscript !=
+                     PyDict_Type.tp_as_mapping->mp_subscript);
         }
 
         op(_GUARD_TOS_DICT, (tos -- tos)) {
@@ -976,12 +978,8 @@ dummy_func(
             PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
             PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st);
 
-            assert(PyDict_Check(dict));
-            DEOPT_IF(!Py_TYPE(dict)->tp_as_mapping);
-            DEOPT_IF(Py_TYPE(dict)->tp_as_mapping->mp_subscript !=
-                     PyDict_Type.tp_as_mapping->mp_subscript);
             STAT_INC(BINARY_OP, hit);
-            PyObject *res_o = PyDict_Type.tp_as_mapping->mp_subscript(dict, sub);
+            PyObject *res_o = _PyDict_Subscript(dict, sub);
             DECREF_INPUTS();
             ERROR_IF(res_o == NULL, error); // not found or error
             res = PyStackRef_FromPyObjectSteal(res_o);

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h