update it

Author: BobTheBuidler

mypyc/test-data/irbuild-basic.test

@@ -1970,7 +1970,6 @@ def f():
     r16 :: i32
     r17 :: bit
     r18 :: native_int
-    r19 :: dict
 L0:
     r0 = PyDict_New()
     r1 = PyList_New(3)
@@ -2011,8 +2010,7 @@ L7:
     r6 = r18
     goto L1
 L8:
-    r19 = cast(dict, r0)
-    return r19
+    return r0
 
 [case testLoopsMultipleAssign]
 from typing import List, Tuple

mypyc/test-data/irbuild-dict.test

@@ -37,11 +37,10 @@ def f() -> None:
 [out]
 def f():
     r0 :: dict[exact]
-    r1, d :: dict
+    d :: dict
 L0:
     r0 = PyDict_New()
-    r1 = cast(dict, r0)
-    d = r1
+    d = r0
     return 1
 
 [case testNewEmptyDictViaFunc]
@@ -52,11 +51,10 @@ def f() -> None:
 [out]
 def f():
     r0 :: dict[exact]
-    r1, d :: dict
+    d :: dict
 L0:
     r0 = PyDict_New()
-    r1 = cast(dict, r0)
-    d = r1
+    d = r0
     return 1
 
 [case testNewDictWithValues]
@@ -68,14 +66,13 @@ def f(x):
     r0 :: str
     r1, r2 :: object
     r3 :: dict[exact]
-    r4, d :: dict
+    d :: dict
 L0:
     r0 = ''
     r1 = object 1
     r2 = object 2
     r3 = CPyDict_Build(2, r1, r2, r0, x)
-    r4 = cast(dict, r3)
-    d = r4
+    d = r3
     return 1
 
 [case testInDict]
@@ -205,25 +202,21 @@ def f(x, y):
     r0 :: str
     r1 :: object
     r2 :: dict[exact]
-    r3 :: dict
-    r4 :: i32
-    r5 :: bit
-    r6 :: object
-    r7 :: i32
-    r8 :: bit
-    r9 :: dict
+    r3 :: i32
+    r4 :: bit
+    r5 :: object
+    r6 :: i32
+    r7 :: bit
 L0:
     r0 = 'z'
     r1 = object 2
     r2 = CPyDict_Build(1, x, r1)
-    r3 = cast(dict, r2)
-    r4 = CPyDict_UpdateInDisplay(r3, y)
-    r5 = r4 >= 0 :: signed
-    r6 = object 3
-    r7 = PyDict_SetItem(r2, r0, r6)
-    r8 = r7 >= 0 :: signed
-    r9 = cast(dict, r2)
-    return r9
+    r3 = CPyDict_UpdateInDisplay(r2, y)
+    r4 = r3 >= 0 :: signed
+    r5 = object 3
+    r6 = PyDict_SetItem(r2, r0, r5)
+    r7 = r6 >= 0 :: signed
+    return r2
 
 [case testDictIterationMethods]
 from typing import Dict, TypedDict, Union
@@ -335,60 +328,59 @@ L12:
 def union_of_dicts(d):
     d :: dict
     r0 :: dict[exact]
-    r1, new :: dict
-    r2 :: short_int
-    r3 :: native_int
-    r4 :: object
-    r5 :: tuple[bool, short_int, object, object]
-    r6 :: short_int
-    r7 :: bool
-    r8, r9 :: object
-    r10 :: str
-    r11 :: union[int, str]
+    new :: dict
+    r1 :: short_int
+    r2 :: native_int
+    r3 :: object
+    r4 :: tuple[bool, short_int, object, object]
+    r5 :: short_int
+    r6 :: bool
+    r7, r8 :: object
+    r9 :: str
+    r10 :: union[int, str]
     k :: str
     v :: union[int, str]
-    r12 :: object
-    r13 :: object[1]
-    r14 :: object_ptr
-    r15 :: object
-    r16 :: int
-    r17 :: object
-    r18 :: i32
-    r19, r20, r21 :: bit
+    r11 :: object
+    r12 :: object[1]
+    r13 :: object_ptr
+    r14 :: object
+    r15 :: int
+    r16 :: object
+    r17 :: i32
+    r18, r19, r20 :: bit
 L0:
     r0 = PyDict_New()
-    r1 = cast(dict, r0)
-    new = r1
-    r2 = 0
-    r3 = PyDict_Size(d)
-    r4 = CPyDict_GetItemsIter(d)
+    new = r0
+    r1 = 0
+    r2 = PyDict_Size(d)
+    r3 = CPyDict_GetItemsIter(d)
 L1:
-    r5 = CPyDict_NextItem(r4, r2)
-    r6 = r5[1]
-    r2 = r6
-    r7 = r5[0]
-    if r7 goto L2 else goto L4 :: bool
+    r4 = CPyDict_NextItem(r3, r1)
+    r5 = r4[1]
+    r1 = r5
+    r6 = r4[0]
+    if r6 goto L2 else goto L4 :: bool
 L2:
-    r8 = r5[2]
-    r9 = r5[3]
-    r10 = cast(str, r8)
-    r11 = cast(union[int, str], r9)
-    k = r10
-    v = r11
-    r12 = load_address PyLong_Type
-    r13 = [v]
-    r14 = load_address r13
-    r15 = PyObject_Vectorcall(r12, r14, 1, 0)
+    r7 = r4[2]
+    r8 = r4[3]
+    r9 = cast(str, r7)
+    r10 = cast(union[int, str], r8)
+    k = r9
+    v = r10
+    r11 = load_address PyLong_Type
+    r12 = [v]
+    r13 = load_address r12
+    r14 = PyObject_Vectorcall(r11, r13, 1, 0)
     keep_alive v
-    r16 = unbox(int, r15)
-    r17 = box(int, r16)
-    r18 = CPyDict_SetItem(new, k, r17)
-    r19 = r18 >= 0 :: signed
+    r15 = unbox(int, r14)
+    r16 = box(int, r15)
+    r17 = CPyDict_SetItem(new, k, r16)
+    r18 = r17 >= 0 :: signed
 L3:
-    r20 = CPyDict_CheckSize(d, r3)
+    r19 = CPyDict_CheckSize(d, r2)
     goto L1
 L4:
-    r21 = CPy_NoErrOccurred()
+    r20 = CPy_NoErrOccurred()
 L5:
     return 1
 def typeddict(d):
@@ -561,8 +553,7 @@ def f4(d, flag):
     r2, r3 :: str
     r4 :: object
     r5 :: dict[exact]
-    r6 :: dict
-    r7, r8 :: object
+    r6, r7 :: object
 L0:
     if flag goto L1 else goto L2 :: bool
 L1:
@@ -574,9 +565,9 @@ L2:
     r3 = 'c'
     r4 = object 1
     r5 = CPyDict_Build(1, r3, r4)
-    r6 = cast(dict, r5)
-    r7 = CPyDict_SetDefault(d, r2, r6)
-    return r7
+    r6 = CPyDict_SetDefault(d, r2, r5)
+    return r6
 L3:
-    r8 = box(None, 1)
-    return r8
+    r7 = box(None, 1)
+    return r7
+

mypyc/test-data/irbuild-generics.test

@@ -168,19 +168,17 @@ def execute(func, args, kwargs):
     args :: tuple
     kwargs :: dict
     r0 :: dict[exact]
-    r1 :: dict
-    r2 :: i32
-    r3 :: bit
-    r4 :: object
-    r5 :: int
+    r1 :: i32
+    r2 :: bit
+    r3 :: object
+    r4 :: int
 L0:
     r0 = PyDict_New()
-    r1 = cast(dict, r0)
-    r2 = CPyDict_UpdateInDisplay(r1, kwargs)
-    r3 = r2 >= 0 :: signed
-    r4 = PyObject_Call(func, args, r0)
-    r5 = unbox(int, r4)
-    return r5
+    r1 = CPyDict_UpdateInDisplay(r0, kwargs)
+    r2 = r1 >= 0 :: signed
+    r3 = PyObject_Call(func, args, r0)
+    r4 = unbox(int, r3)
+    return r4
 def f(x):
     x :: int
 L0:
@@ -702,15 +700,14 @@ def inner_deco_obj.__call__(__mypyc_self__, args, kwargs):
     v :: object
     r18 :: i32
     r19, r20, r21 :: bit
-    r22, can_dictcomp :: dict
-    r23, can_iter, r24, can_use_keys, r25, can_use_values :: list
-    r26 :: object
-    r27 :: dict[exact]
-    r28 :: dict
-    r29 :: i32
-    r30 :: bit
-    r31 :: object
-    r32 :: int
+    can_dictcomp :: dict
+    r22, can_iter, r23, can_use_keys, r24, can_use_values :: list
+    r25 :: object
+    r26 :: dict[exact]
+    r27 :: i32
+    r28 :: bit
+    r29 :: object
+    r30 :: int
 L0:
     r0 = __mypyc_self__.__mypyc_env__
     r1 = var_object_size args
@@ -754,22 +751,20 @@ L7:
 L8:
     r21 = CPy_NoErrOccurred()
 L9:
-    r22 = cast(dict, r8)
-    can_dictcomp = r22
-    r23 = PySequence_List(kwargs)
-    can_iter = r23
-    r24 = CPyDict_Keys(kwargs)
-    can_use_keys = r24
-    r25 = CPyDict_Values(kwargs)
-    can_use_values = r25
-    r26 = r0.func
-    r27 = PyDict_New()
-    r28 = cast(dict, r27)
-    r29 = CPyDict_UpdateInDisplay(r28, kwargs)
-    r30 = r29 >= 0 :: signed
-    r31 = PyObject_Call(r26, args, r27)
-    r32 = unbox(int, r31)
-    return r32
+    can_dictcomp = r8
+    r22 = PySequence_List(kwargs)
+    can_iter = r22
+    r23 = CPyDict_Keys(kwargs)
+    can_use_keys = r23
+    r24 = CPyDict_Values(kwargs)
+    can_use_values = r24
+    r25 = r0.func
+    r26 = PyDict_New()
+    r27 = CPyDict_UpdateInDisplay(r26, kwargs)
+    r28 = r27 >= 0 :: signed
+    r29 = PyObject_Call(r25, args, r26)
+    r30 = unbox(int, r29)
+    return r30
 def deco(func):
     func :: object
     r0 :: __main__.deco_env
@@ -788,3 +783,4 @@ def f(x):
     x :: int
 L0:
     return x
+