update ir

Author: BobTheBuidler

mypyc/test-data/irbuild-basic.test

@@ -966,10 +966,10 @@ def f(o, p, n, b, t, s, a, l, d):
     s :: tuple[int, int]
     a :: __main__.A
     l :: list
-    d :: dict[exact]
+    d :: dict
     r0 :: object
     l2 :: list
-    d2 :: dict[exact]
+    d2 :: dict
 L0:
     o = o
     p = p
@@ -1743,15 +1743,18 @@ L0:
 def g():
     r0, r1, r2 :: str
     r3, r4, r5 :: object
-    r6, r7 :: dict[exact]
-    r8 :: str
-    r9 :: object
-    r10 :: dict[exact]
-    r11 :: i32
-    r12 :: bit
-    r13 :: tuple
-    r14 :: object
-    r15 :: tuple[int, int, int]
+    r6 :: dict[exact]
+    r7 :: dict
+    r8 :: dict[exact]
+    r9 :: str
+    r10 :: object
+    r11 :: dict[exact]
+    r12 :: dict
+    r13 :: i32
+    r14 :: bit
+    r15 :: tuple
+    r16 :: object
+    r17 :: tuple[int, int, int]
 L0:
     r0 = 'a'
     r1 = 'b'
@@ -1760,46 +1763,53 @@ L0:
     r4 = object 2
     r5 = object 3
     r6 = CPyDict_Build(3, r0, r3, r1, r4, r2, r5)
-    r7 = __main__.globals :: static
-    r8 = 'f'
-    r9 = CPyDict_GetItemUnsafe(r7, r8)
-    r10 = PyDict_New()
-    r11 = PyDict_Update(r10, r6)
-    r12 = r11 >= 0 :: signed
-    r13 = PyTuple_Pack(0)
-    r14 = PyObject_Call(r9, r13, r10)
-    r15 = unbox(tuple[int, int, int], r14)
-    return r15
+    r7 = cast(dict, r6)
+    r8 = __main__.globals :: static
+    r9 = 'f'
+    r10 = CPyDict_GetItemUnsafe(r8, r9)
+    r11 = PyDict_New()
+    r12 = cast(dict, r11)
+    r13 = CPyDict_UpdateInDisplay(r12, r7)
+    r14 = r13 >= 0 :: signed
+    r15 = PyTuple_Pack(0)
+    r16 = PyObject_Call(r10, r15, r11)
+    r17 = unbox(tuple[int, int, int], r16)
+    return r17
 def h():
     r0, r1 :: str
     r2, r3 :: object
-    r4, r5 :: dict[exact]
-    r6 :: str
-    r7 :: object
-    r8 :: dict[exact]
-    r9 :: i32
-    r10 :: bit
-    r11 :: object
-    r12 :: tuple
+    r4 :: dict[exact]
+    r5 :: dict
+    r6 :: dict[exact]
+    r7 :: str
+    r8 :: object
+    r9 :: dict[exact]
+    r10 :: dict
+    r11 :: i32
+    r12 :: bit
     r13 :: object
-    r14 :: tuple[int, int, int]
+    r14 :: tuple
+    r15 :: object
+    r16 :: tuple[int, int, int]
 L0:
     r0 = 'b'
     r1 = 'c'
     r2 = object 2
     r3 = object 3
     r4 = CPyDict_Build(2, r0, r2, r1, r3)
-    r5 = __main__.globals :: static
-    r6 = 'f'
-    r7 = CPyDict_GetItemUnsafe(r5, r6)
-    r8 = PyDict_New()
-    r9 = PyDict_Update(r8, r4)
-    r10 = r9 >= 0 :: signed
-    r11 = object 1
-    r12 = PyTuple_Pack(1, r11)
-    r13 = PyObject_Call(r7, r12, r8)
-    r14 = unbox(tuple[int, int, int], r13)
-    return r14
+    r5 = cast(dict, r4)
+    r6 = __main__.globals :: static
+    r7 = 'f'
+    r8 = CPyDict_GetItemUnsafe(r6, r7)
+    r9 = PyDict_New()
+    r10 = cast(dict, r9)
+    r11 = CPyDict_UpdateInDisplay(r10, r5)
+    r12 = r11 >= 0 :: signed
+    r13 = object 1
+    r14 = PyTuple_Pack(1, r13)
+    r15 = PyObject_Call(r8, r14, r9)
+    r16 = unbox(tuple[int, int, int], r15)
+    return r16
 
 [case testFunctionCallWithDefaultArgs]
 def f(x: int, y: int = 3, z: str = "test") -> None:
@@ -1960,6 +1970,7 @@ def f():
     r16 :: i32
     r17 :: bit
     r18 :: native_int
+    r19 :: dict
 L0:
     r0 = PyDict_New()
     r1 = PyList_New(3)
@@ -2000,7 +2011,8 @@ L7:
     r6 = r18
     goto L1
 L8:
-    return r0
+    r19 = cast(dict, r0)
+    return r19
 
 [case testLoopsMultipleAssign]
 from typing import List, Tuple

mypyc/test-data/irbuild-bytes.test

@@ -9,7 +9,7 @@ def f(num: int, l: list, d: dict, s: str) -> None:
 def f(num, l, d, s):
     num :: int
     l :: list
-    d :: dict[exact]
+    d :: dict
     s :: str
     r0, r1 :: object
     r2, b1 :: bytes

mypyc/test-data/irbuild-dict.test

@@ -4,12 +4,12 @@ def f(d: Dict[int, bool]) -> bool:
     return d[0]
 [out]
 def f(d):
-    d :: dict[exact]
+    d :: dict
     r0, r1 :: object
     r2 :: bool
 L0:
     r0 = object 0
-    r1 = CPyDict_GetItemUnsafe(d, r0)
+    r1 = CPyDict_GetItem(d, r0)
     r2 = unbox(bool, r1)
     return r2
 
@@ -19,14 +19,14 @@ def f(d: Dict[int, bool]) -> None:
     d[0] = False
 [out]
 def f(d):
-    d :: dict[exact]
+    d :: dict
     r0, r1 :: object
     r2 :: i32
     r3 :: bit
 L0:
     r0 = object 0
     r1 = box(bool, 0)
-    r2 = PyDict_SetItem(d, r0, r1)
+    r2 = CPyDict_SetItem(d, r0, r1)
     r3 = r2 >= 0 :: signed
     return 1
 
@@ -481,93 +481,90 @@ def f4(d: Dict[object, object], flag: bool) -> object:
         return d.setdefault('a', {'c': 1})
 [out]
 def f(d):
-    d :: dict[exact]
+    d :: dict
     r0, r1 :: str
     r2 :: object
 L0:
     r0 = 'a'
     r1 = 'b'
-    r2 = PyDict_SetDefault(d, r0, r1)
+    r2 = CPyDict_SetDefault(d, r0, r1)
     return r2
 def f2(d, flag):
-    d :: dict[exact]
+    d :: dict
     flag :: bool
     r0 :: str
-    r1 :: dict
-    r2 :: object
-    r3, r4 :: str
-    r5 :: set
-    r6, r7 :: object
+    r1 :: object
+    r2, r3 :: str
+    r4 :: set
+    r5, r6 :: object
 L0:
     if flag goto L1 else goto L2 :: bool
 L1:
     r0 = 'a'
-    r1 = cast(dict, d)
-    r2 = CPyDict_SetDefaultWithEmptyDatatype(r1, r0, 3)
-    return r2
+    r1 = CPyDict_SetDefaultWithEmptyDatatype(d, r0, 3)
+    return r1
 L2:
-    r3 = 'a'
-    r4 = 'b'
-    r5 = PySet_New(r4)
-    r6 = PyDict_SetDefault(d, r3, r5)
-    return r6
+    r2 = 'a'
+    r3 = 'b'
+    r4 = PySet_New(r3)
+    r5 = CPyDict_SetDefault(d, r2, r4)
+    return r5
 L3:
-    r7 = box(None, 1)
-    return r7
+    r6 = box(None, 1)
+    return r6
 def f3(d, flag):
-    d :: dict[exact]
+    d :: dict
     flag :: bool
     r0 :: str
-    r1 :: dict
-    r2 :: object
-    r3 :: str
-    r4 :: list
-    r5 :: object
-    r6 :: ptr
-    r7, r8 :: object
+    r1 :: object
+    r2 :: str
+    r3 :: list
+    r4 :: object
+    r5 :: ptr
+    r6, r7 :: object
 L0:
     if flag goto L1 else goto L2 :: bool
 L1:
     r0 = 'a'
-    r1 = cast(dict, d)
-    r2 = CPyDict_SetDefaultWithEmptyDatatype(r1, r0, 1)
-    return r2
+    r1 = CPyDict_SetDefaultWithEmptyDatatype(d, r0, 1)
+    return r1
 L2:
-    r3 = 'a'
-    r4 = PyList_New(1)
-    r5 = object 1
-    r6 = list_items r4
-    buf_init_item r6, 0, r5
-    keep_alive r4
-    r7 = PyDict_SetDefault(d, r3, r4)
-    return r7
+    r2 = 'a'
+    r3 = PyList_New(1)
+    r4 = object 1
+    r5 = list_items r3
+    buf_init_item r5, 0, r4
+    keep_alive r3
+    r6 = CPyDict_SetDefault(d, r2, r3)
+    return r6
 L3:
-    r8 = box(None, 1)
-    return r8
+    r7 = box(None, 1)
+    return r7
 def f4(d, flag):
-    d :: dict[exact]
+    d :: dict
     flag :: bool
     r0 :: str
-    r1 :: dict
-    r2 :: object
-    r3, r4 :: str
-    r5 :: object
-    r6 :: dict[exact]
+    r1 :: object
+    r2, r3 :: str
+    r4 :: object
+    r5 :: dict[exact]
+    r6 :: dict
     r7, r8 :: object
 L0:
     if flag goto L1 else goto L2 :: bool
 L1:
     r0 = 'a'
-    r1 = cast(dict, d)
-    r2 = CPyDict_SetDefaultWithEmptyDatatype(r1, r0, 2)
-    return r2
+    r1 = CPyDict_SetDefaultWithEmptyDatatype(d, r0, 2)
+    return r1
 L2:
-    r3 = 'a'
-    r4 = 'c'
-    r5 = object 1
-    r6 = CPyDict_Build(1, r4, r5)
-    r7 = PyDict_SetDefault(d, r3, r6)
+    r2 = 'a'
+    r3 = 'c'
+    r4 = object 1
+    r5 = CPyDict_Build(1, r3, r4)
+    r6 = cast(dict, r5)
+    r7 = CPyDict_SetDefault(d, r2, r6)
     return r7
 L3:
     r8 = box(None, 1)
     return r8
+