dict stuff

Author: BobTheBuidler

mypyc/irbuild/builder.py

@@ -92,7 +92,6 @@
     RUnion,
     bitmap_rprimitive,
     c_pyssize_t_rprimitive,
-    dict_rprimitive,
     int_rprimitive,
     is_float_rprimitive,
     is_list_rprimitive,
@@ -103,6 +102,7 @@
     none_rprimitive,
     object_rprimitive,
     str_rprimitive,
+    true_dict_rprimitive,
 )
 from mypyc.irbuild.context import FuncInfo, ImplicitClass
 from mypyc.irbuild.ll_builder import LowLevelIRBuilder
@@ -124,7 +124,11 @@
 )
 from mypyc.irbuild.util import bytes_from_str, is_constant
 from mypyc.options import CompilerOptions
-from mypyc.primitives.dict_ops import dict_get_item_op, true_dict_set_item_op
+from mypyc.primitives.dict_ops import (
+    dict_get_item_op,
+    true_dict_get_item_op,
+    true_dict_set_item_op,
+)
 from mypyc.primitives.generic_ops import iter_op, next_op, py_setattr_op
 from mypyc.primitives.list_ops import list_get_item_unsafe_op, list_pop_last, to_list
 from mypyc.primitives.misc_ops import check_unpack_count_op, get_module_dict_op, import_op
@@ -1370,10 +1374,10 @@ def load_global(self, expr: NameExpr) -> Value:
     def load_global_str(self, name: str, line: int) -> Value:
         _globals = self.load_globals_dict()
         reg = self.load_str(name)
-        return self.primitive_op(dict_get_item_op, [_globals, reg], line)
+        return self.primitive_op(true_dict_get_item_op, [_globals, reg], line)
 
     def load_globals_dict(self) -> Value:
-        return self.add(LoadStatic(dict_rprimitive, "globals", self.module_name))
+        return self.add(LoadStatic(true_dict_rprimitive, "globals", self.module_name))
 
     def load_module_attr_by_fullname(self, fullname: str, line: int) -> Value:
         module, _, name = fullname.rpartition(".")

mypyc/irbuild/ll_builder.py

@@ -109,6 +109,7 @@
     is_short_int_rprimitive,
     is_str_rprimitive,
     is_tagged,
+    is_true_dict_rprimitive,
     is_tuple_rprimitive,
     is_uint8_rprimitive,
     list_rprimitive,
@@ -128,6 +129,8 @@
     dict_new_op,
     dict_ssize_t_size_op,
     dict_update_in_display_op,
+    true_dict_copy_op,
+    true_dict_update_op,
 )
 from mypyc.primitives.exc_ops import err_occurred_op, keep_propagating_op
 from mypyc.primitives.float_ops import copysign_op, int_to_float_op
@@ -787,8 +790,11 @@ def _construct_varargs(
             elif kind == ARG_STAR2:
                 if star2_result is None:
                     star2_result = self._create_dict(star2_keys, star2_values, line)
-
-                self.call_c(dict_update_in_display_op, [star2_result, value], line=line)
+                if is_true_dict_rprimitive(value):
+                    op = true_dict_update_op
+                else:
+                    op = dict_update_in_display_op
+                self.call_c(op, [star2_result, value], line=line)
             else:
                 nullable = kind.is_optional()
                 maybe_pos = kind.is_positional() and has_star
@@ -1652,9 +1658,18 @@ def make_dict(self, key_value_pairs: Sequence[DictEntry], line: int) -> Value:
             else:
                 # **value
                 if result is None:
+                    if len(key_value_pairs) == 1 and is_true_dict_rprimitive(value):
+                        # fast path for cases like `my_func(**dict(zip(iterable, other)))` and similar
+                        return self.call_c(true_dict_copy_op, [value], line=line)
+                    
                     result = self._create_dict(keys, values, line)
-
-                self.call_c(dict_update_in_display_op, [result, value], line=line)
+                
+                if is_true_dict_rprimitive(value):
+                    op = true_dict_update_op
+                else:
+                    op = dict_update_in_display_op
+                
+                self.call_c(op, [result, value], line=line)
 
         if result is None:
             result = self._create_dict(keys, values, line)

mypyc/irbuild/match.py

@@ -22,9 +22,9 @@
 from mypyc.irbuild.builder import IRBuilder
 from mypyc.primitives.dict_ops import (
     dict_copy,
-    dict_del_item,
     mapping_has_key,
     supports_mapping_protocol,
+    true_dict_del_item,
 )
 from mypyc.primitives.generic_ops import generic_ssize_t_len_op
 from mypyc.primitives.list_ops import (
@@ -239,7 +239,7 @@ def visit_mapping_pattern(self, pattern: MappingPattern) -> None:
             self.builder.assign(target, rest, pattern.rest.line)
 
             for i, key_name in enumerate(keys):
-                self.builder.call_c(dict_del_item, [rest, key_name], pattern.keys[i].line)
+                self.builder.call_c(true_dict_del_item, [rest, key_name], pattern.keys[i].line)
 
             self.builder.goto(self.code_block)
 

mypyc/lib-rt/CPy.h

@@ -705,18 +705,12 @@ 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);
+PyObject *CPyDict_KeysViewUnsafe(PyObject *dict);
+PyObject *CPyDict_ValuesViewUnsafe(PyObject *dict);
+PyObject *CPyDict_ItemsViewUnsafe(PyObject *dict);
 
 // Check that dictionary didn't change size during iteration.
 static inline char CPyDict_CheckSize(PyObject *dict, Py_ssize_t size) {

mypyc/lib-rt/dict_ops.c

@@ -326,18 +326,14 @@ PyObject *CPyDict_Copy(PyObject *dict) {
 
 PyObject *CPyDict_GetKeysIter(PyObject *dict) {
     if (PyDict_CheckExact(dict)) {
-        // Return dict itself to indicate we can use fast path instead.
-        Py_INCREF(dict);
-        return dict;
+        return CPyDict_GetKeysIterUnsafe(dict);
     }
     return PyObject_GetIter(dict);
 }
 
 PyObject *CPyDict_GetItemsIter(PyObject *dict) {
     if (PyDict_CheckExact(dict)) {
-        // Return dict itself to indicate we can use fast path instead.
-        Py_INCREF(dict);
-        return dict;
+        return CPyDict_GetItemsIterUnsafe(dict);
     }
     _Py_IDENTIFIER(items);
     PyObject *name = _PyUnicode_FromId(&PyId_items); /* borrowed */
@@ -506,66 +502,32 @@ PyObject *CPyDict_GetItemUnsafe(PyObject *dict, PyObject *key) {
     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
+    // No type check, direct call. Returns dict directly to indicate fast path should be used.
     Py_INCREF(dict);
     return dict;
 }
 
 PyObject *CPyDict_GetItemsIterUnsafe(PyObject *dict) {
-    // No type check, direct call
+    // No type check, direct call. Returns dict directly to indicate fast path should be used.
     Py_INCREF(dict);
     return dict;
 }
 
 PyObject *CPyDict_GetValuesIterUnsafe(PyObject *dict) {
-    // No type check, direct call
+    // No type check, direct call. Returns dict directly to indicate fast path should be used.
     Py_INCREF(dict);
     return dict;
 }
+
+PyObject *CPyDict_KeysViewUnsafe(PyObject *dict) {
+    return _CPyDictView_New(dict, &PyDictKeys_Type);
+}
+
+PyObject *CPyDict_ValuesViewUnsafe(PyObject *dict) {
+    return _CPyDictView_New(dict, &PyDictValues_Type);
+}
+
+PyObject *CPyDict_ItemsViewUnsafe(PyObject *dict) {
+    return _CPyDictView_New(dict, &PyDictItems_Type);
+}

mypyc/primitives/dict_ops.py

@@ -95,7 +95,7 @@
     name="__setitem__",
     arg_types=[true_dict_rprimitive, object_rprimitive, object_rprimitive],
     return_type=c_int_rprimitive,
-    c_function_name="CPyDict_SetItemUnsafe",
+    c_function_name="PyDict_SetItem",
     error_kind=ERR_NEG_INT,
 )
 
@@ -339,7 +339,7 @@
     name="clear",
     arg_types=[true_dict_rprimitive],
     return_type=bit_rprimitive,
-    c_function_name="CPyDict_ClearUnsafe",
+    c_function_name="PyDict_Clear",
     error_kind=ERR_FALSE,
 )
 
@@ -353,11 +353,11 @@
 )
 
 # dict.copy()
-method_op(
+true_dict_copy_op = method_op(
     name="copy",
     arg_types=[true_dict_rprimitive],
     return_type=true_dict_rprimitive,
-    c_function_name="CPyDict_CopyUnsafe",
+    c_function_name="PyDict_Copy",
     error_kind=ERR_MAGIC,
 )
 
@@ -374,7 +374,7 @@
 true_dict_keys_op = custom_op(
     arg_types=[true_dict_rprimitive],
     return_type=list_rprimitive,
-    c_function_name="CPyDict_KeysUnsafe",
+    c_function_name="PyDict_Keys",
     error_kind=ERR_MAGIC,
 )
 
@@ -390,7 +390,7 @@
 true_dict_values_op = custom_op(
     arg_types=[true_dict_rprimitive],
     return_type=list_rprimitive,
-    c_function_name="CPyDict_ValuesUnsafe",
+    c_function_name="PyDict_Values",
     error_kind=ERR_MAGIC,
 )
 
@@ -406,7 +406,7 @@
 true_dict_items_op = custom_op(
     arg_types=[true_dict_rprimitive],
     return_type=list_rprimitive,
-    c_function_name="CPyDict_ItemsUnsafe",
+    c_function_name="PyDict_Items",
     error_kind=ERR_MAGIC,
 )
 
@@ -514,6 +514,13 @@
 )
 
 # Delete an item from a dict
+true_dict_del_item = custom_op(
+    arg_types=[true_dict_rprimitive, object_rprimitive],
+    return_type=c_int_rprimitive,
+    c_function_name="PyDict_DelItem",
+    error_kind=ERR_NEG_INT,
+)
+
 dict_del_item = custom_op(
     arg_types=[object_rprimitive, object_rprimitive],
     return_type=c_int_rprimitive,