gpt round 1

Author: BobTheBuidler

mypyc/lib-rt/CPy.h

@@ -703,6 +703,21 @@ tuple_T3CIO CPyDict_NextValue(PyObject *dict_or_iter, CPyTagged offset);
 tuple_T4CIOO CPyDict_NextItem(PyObject *dict_or_iter, CPyTagged offset);
 int CPyMapping_Check(PyObject *obj);
 
+// Unsafe dict operations (assume PyDict_CheckExact(dict) is always true)
+PyObject *CPyDict_GetItemUnsafe(PyObject *dict, PyObject *key);
+int CPyDict_SetItemUnsafe(PyObject *dict, PyObject *key, PyObject *value);
+PyObject *CPyDict_KeysViewUnsafe(PyObject *dict);
+PyObject *CPyDict_ValuesViewUnsafe(PyObject *dict);
+PyObject *CPyDict_ItemsViewUnsafe(PyObject *dict);
+PyObject *CPyDict_KeysUnsafe(PyObject *dict);
+PyObject *CPyDict_ValuesUnsafe(PyObject *dict);
+PyObject *CPyDict_ItemsUnsafe(PyObject *dict);
+char CPyDict_ClearUnsafe(PyObject *dict);
+PyObject *CPyDict_CopyUnsafe(PyObject *dict);
+PyObject *CPyDict_GetKeysIterUnsafe(PyObject *dict);
+PyObject *CPyDict_GetItemsIterUnsafe(PyObject *dict);
+PyObject *CPyDict_GetValuesIterUnsafe(PyObject *dict);
+
 // Check that dictionary didn't change size during iteration.
 static inline char CPyDict_CheckSize(PyObject *dict, Py_ssize_t size) {
     if (!PyDict_CheckExact(dict)) {

mypyc/lib-rt/dict_ops.c

@@ -15,15 +15,7 @@
 // some indirections.
 PyObject *CPyDict_GetItem(PyObject *dict, PyObject *key) {
     if (PyDict_CheckExact(dict)) {
-        PyObject *res = PyDict_GetItemWithError(dict, key);
-        if (!res) {
-            if (!PyErr_Occurred()) {
-                PyErr_SetObject(PyExc_KeyError, key);
-            }
-        } else {
-            Py_INCREF(res);
-        }
-        return res;
+        return CPyDict_GetItemUnsafe(dict, key);
     } else {
         return PyObject_GetItem(dict, key);
     }
@@ -168,23 +160,13 @@ int CPyDict_Update(PyObject *dict, PyObject *stuff) {
 
 int CPyDict_UpdateFromAny(PyObject *dict, PyObject *stuff) {
     if (PyDict_CheckExact(dict)) {
-        return CPyDict_UpdateFromAnyUnsafe(dict, stuff)
+        // Argh this sucks
+        return CPyDict_UpdateFromAnyUnsafe(dict, stuff);
     } else {
         return CPyDict_UpdateGeneral(dict, stuff);
     }
 }
 
-// Unsafe because it assumes `dict` is an actual dict, never a subclass.
-int CPyDict_UpdateFromAnyUnsafe(PyObject *dict, PyObject *stuff) {
-    // Argh this sucks
-    _Py_IDENTIFIER(keys);
-    if (PyDict_Check(stuff) || _CPyObject_HasAttrId(stuff, &PyId_keys)) {
-        return PyDict_Update(dict, stuff);
-    } else {
-        return PyDict_MergeFromSeq2(dict, stuff, 1);
-    }
-}
-
 PyObject *CPyDict_FromAny(PyObject *obj) {
     if (PyDict_Check(obj)) {
         return PyDict_Copy(obj);
@@ -494,3 +476,96 @@ tuple_T4CIOO CPyDict_NextItem(PyObject *dict_or_iter, CPyTagged offset) {
 int CPyMapping_Check(PyObject *obj) {
     return Py_TYPE(obj)->tp_flags & Py_TPFLAGS_MAPPING;
 }
+
+// =======================
+// Unsafe dict operations
+// =======================
+
+// Unsafe: assumes dict is a true dict (PyDict_CheckExact(dict) is always true)
+
+int CPyDict_UpdateFromAnyUnsafe(PyObject *dict, PyObject *stuff) {
+    // Argh this sucks
+    _Py_IDENTIFIER(keys);
+    if (PyDict_Check(stuff) || _CPyObject_HasAttrId(stuff, &PyId_keys)) {
+        return PyDict_Update(dict, stuff);
+    } else {
+        return PyDict_MergeFromSeq2(dict, stuff, 1);
+    }
+}
+
+PyObject *CPyDict_GetItemUnsafe(PyObject *dict, PyObject *key) {
+    // No type check, direct call
+    PyObject *res = PyDict_GetItemWithError(dict, key);
+    if (!res) {
+        if (!PyErr_Occurred()) {
+            PyErr_SetObject(PyExc_KeyError, key);
+        }
+    } else {
+        Py_INCREF(res);
+    }
+    return res;
+}
+
+int CPyDict_SetItemUnsafe(PyObject *dict, PyObject *key, PyObject *value) {
+    // No type check, direct call
+    return PyDict_SetItem(dict, key, value);
+}
+
+PyObject *CPyDict_KeysViewUnsafe(PyObject *dict) {
+    // No type check, direct call
+    return _CPyDictView_New(dict, &PyDictKeys_Type);
+}
+
+PyObject *CPyDict_ValuesViewUnsafe(PyObject *dict) {
+    // No type check, direct call
+    return _CPyDictView_New(dict, &PyDictValues_Type);
+}
+
+PyObject *CPyDict_ItemsViewUnsafe(PyObject *dict) {
+    // No type check, direct call
+    return _CPyDictView_New(dict, &PyDictItems_Type);
+}
+
+PyObject *CPyDict_KeysUnsafe(PyObject *dict) {
+    // No type check, direct call
+    return PyDict_Keys(dict);
+}
+
+PyObject *CPyDict_ValuesUnsafe(PyObject *dict) {
+    // No type check, direct call
+    return PyDict_Values(dict);
+}
+
+PyObject *CPyDict_ItemsUnsafe(PyObject *dict) {
+    // No type check, direct call
+    return PyDict_Items(dict);
+}
+
+char CPyDict_ClearUnsafe(PyObject *dict) {
+    // No type check, direct call
+    PyDict_Clear(dict);
+    return 1;
+}
+
+PyObject *CPyDict_CopyUnsafe(PyObject *dict) {
+    // No type check, direct call
+    return PyDict_Copy(dict);
+}
+
+PyObject *CPyDict_GetKeysIterUnsafe(PyObject *dict) {
+    // No type check, direct call
+    Py_INCREF(dict);
+    return dict;
+}
+
+PyObject *CPyDict_GetItemsIterUnsafe(PyObject *dict) {
+    // No type check, direct call
+    Py_INCREF(dict);
+    return dict;
+}
+
+PyObject *CPyDict_GetValuesIterUnsafe(PyObject *dict) {
+    // No type check, direct call
+    Py_INCREF(dict);
+    return dict;
+}

mypyc/primitives/dict_ops.py

@@ -77,7 +77,7 @@
     name="__getitem__",
     arg_types=[true_dict_rprimitive, object_rprimitive],
     return_type=object_rprimitive,
-    c_function_name="PyDict_GetItem",
+    c_function_name="CPyDict_GetItemUnsafe",
     error_kind=ERR_MAGIC,
 )
 
@@ -95,7 +95,7 @@
     name="__setitem__",
     arg_types=[true_dict_rprimitive, object_rprimitive, object_rprimitive],
     return_type=c_int_rprimitive,
-    c_function_name="PyDict_SetItem",
+    c_function_name="CPyDict_SetItemUnsafe",
     error_kind=ERR_NEG_INT,
 )
 
@@ -155,7 +155,7 @@
     name="update",
     arg_types=[true_dict_rprimitive, dict_rprimitive],
     return_type=c_int_rprimitive,
-    c_function_name="CPyDict_Update",
+    c_function_name="PyDict_Update",
     error_kind=ERR_NEG_INT,
     priority=2,
 )
@@ -285,7 +285,7 @@
     name="keys",
     arg_types=[true_dict_rprimitive],
     return_type=object_rprimitive,
-    c_function_name="CPyDict_KeysView",
+    c_function_name="CPyDict_KeysViewUnsafe",
     error_kind=ERR_MAGIC,
 )
 
@@ -303,7 +303,7 @@
     name="values",
     arg_types=[true_dict_rprimitive],
     return_type=object_rprimitive,
-    c_function_name="CPyDict_ValuesView",
+    c_function_name="CPyDict_ValuesViewUnsafe",
     error_kind=ERR_MAGIC,
 )
 
@@ -321,7 +321,7 @@
     name="items",
     arg_types=[true_dict_rprimitive],
     return_type=object_rprimitive,
-    c_function_name="CPyDict_ItemsView",
+    c_function_name="CPyDict_ItemsViewUnsafe",
     error_kind=ERR_MAGIC,
 )
 
@@ -339,7 +339,7 @@
     name="clear",
     arg_types=[true_dict_rprimitive],
     return_type=bit_rprimitive,
-    c_function_name="PyDict_Clear",
+    c_function_name="CPyDict_ClearUnsafe",
     error_kind=ERR_FALSE,
 )
 
@@ -357,7 +357,7 @@
     name="copy",
     arg_types=[true_dict_rprimitive],
     return_type=true_dict_rprimitive,
-    c_function_name="PyDict_Copy",
+    c_function_name="CPyDict_CopyUnsafe",
     error_kind=ERR_MAGIC,
 )
 
@@ -374,55 +374,55 @@
 true_dict_keys_op = custom_op(
     arg_types=[true_dict_rprimitive],
     return_type=list_rprimitive,
-    c_function_name="PyDict_Keys",
+    c_function_name="CPyDict_KeysUnsafe",
     error_kind=ERR_MAGIC,
 )
 
 # list(dictorsubclass.keys())
 dict_keys_op = custom_op(
     arg_types=[dict_rprimitive],
     return_type=list_rprimitive,
-    c_function_name="CPyDict_Keys",
+    c_function_name="PyDict_Keys",
     error_kind=ERR_MAGIC,
 )
 
 # list(dict.values())
 true_dict_values_op = custom_op(
     arg_types=[true_dict_rprimitive],
     return_type=list_rprimitive,
-    c_function_name="PyDict_Values",
+    c_function_name="CPyDict_ValuesUnsafe",
     error_kind=ERR_MAGIC,
 )
 
 # list(dictorsubclass.values())
 dict_values_op = custom_op(
     arg_types=[dict_rprimitive],
     return_type=list_rprimitive,
-    c_function_name="CPyDict_Values",
+    c_function_name="PyDict_Values",
     error_kind=ERR_MAGIC,
 )
 
 # list(dict.items())
 true_dict_items_op = custom_op(
-    arg_types=[dict_rprimitive],
+    arg_types=[true_dict_rprimitive],
     return_type=list_rprimitive,
-    c_function_name="PyDict_Items",
+    c_function_name="CPyDict_ItemsUnsafe",
     error_kind=ERR_MAGIC,
 )
 
 # list(dictorsubclass.items())
 dict_items_op = custom_op(
     arg_types=[dict_rprimitive],
     return_type=list_rprimitive,
-    c_function_name="CPyDict_Items",
+    c_function_name="PyDict_Items",
     error_kind=ERR_MAGIC,
 )
 
 # PyDict_Next() fast iteration
 true_dict_key_iter_op = custom_op(
     arg_types=[true_dict_rprimitive],
     return_type=object_rprimitive,
-    c_function_name="CPyDict_GetKeysIter",
+    c_function_name="CPyDict_GetKeysIterUnsafe",
     error_kind=ERR_MAGIC,
 )
 
@@ -437,7 +437,7 @@
 true_dict_value_iter_op = custom_op(
     arg_types=[true_dict_rprimitive],
     return_type=object_rprimitive,
-    c_function_name="CPyDict_GetValuesIter",
+    c_function_name="CPyDict_GetValuesIterUnsafe",
     error_kind=ERR_MAGIC,
 )
 
@@ -451,7 +451,7 @@
 true_dict_item_iter_op = custom_op(
     arg_types=[true_dict_rprimitive],
     return_type=object_rprimitive,
-    c_function_name="CPyDict_GetItemsIter",
+    c_function_name="CPyDict_GetItemsIterUnsafe",
     error_kind=ERR_MAGIC,
 )