chore: adjust ir to master

BobTheBuidler · BobTheBuidler · commit da06933c3e57 · 2025-07-25T22:10:07.000Z
diff --git a/mypyc/test-data/irbuild-frozenset.test b/mypyc/test-data/irbuild-frozenset.test
@@ -201,13 +201,13 @@ def fn():
     r6, abc :: tuple
     r7 :: native_int
     r8 :: list
-    r9 :: native_int
-    r10 :: bit
-    r11 :: object
-    r12, i :: int
-    r13 :: str
-    r14 :: native_int
-    r15 :: frozenset
+    r9, r10 :: native_int
+    r11 :: bit
+    r12 :: object
+    r13, i :: int
+    r14 :: str
+    r15 :: native_int
+    r16 :: frozenset
 L0:
     r0 = load_address PyRange_Type
     r1 = object 3
@@ -222,21 +222,22 @@ L0:
     r8 = PyList_New(r7)
     r9 = 0
 L1:
-    r10 = r9 < r7 :: signed
-    if r10 goto L2 else goto L4 :: bool
+    r10 = var_object_size abc
+    r11 = r9 < r10 :: signed
+    if r11 goto L2 else goto L4 :: bool
 L2:
-    r11 = CPySequenceTuple_GetItemUnsafe(abc, r9)
-    r12 = unbox(int, r11)
-    i = r12
-    r13 = CPyTagged_Str(i)
-    CPyList_SetItemUnsafe(r8, r9, r13)
+    r12 = CPySequenceTuple_GetItemUnsafe(abc, r9)
+    r13 = unbox(int, r12)
+    i = r13
+    r14 = CPyTagged_Str(i)
+    CPyList_SetItemUnsafe(r8, r9, r14)
 L3:
-    r14 = r9 + 1
-    r9 = r14
+    r15 = r9 + 1
+    r9 = r15
     goto L1
 L4:
-    r15 = PyFrozenSet_New(r8)
-    return r15
+    r16 = PyFrozenSet_New(r8)
+    return r16
 
 [case testFrozenSetFromRange5]
 from typing import FrozenSet
@@ -253,13 +254,13 @@ def fn():
     r7, abc :: tuple
     r8 :: native_int
     r9 :: list
-    r10 :: native_int
-    r11 :: bit
-    r12 :: object
-    r13, i :: int
-    r14 :: str
-    r15 :: native_int
-    r16 :: frozenset
+    r10, r11 :: native_int
+    r12 :: bit
+    r13 :: object
+    r14, i :: int
+    r15 :: str
+    r16 :: native_int
+    r17 :: frozenset
 L0:
     r0 = load_address PyRange_Type
     r1 = object 1
@@ -275,21 +276,22 @@ L0:
     r9 = PyList_New(r8)
     r10 = 0
 L1:
-    r11 = r10 < r8 :: signed
-    if r11 goto L2 else goto L4 :: bool
+    r11 = var_object_size abc
+    r12 = r10 < r11 :: signed
+    if r12 goto L2 else goto L4 :: bool
 L2:
-    r12 = CPySequenceTuple_GetItemUnsafe(abc, r10)
-    r13 = unbox(int, r12)
-    i = r13
-    r14 = CPyTagged_Str(i)
-    CPyList_SetItemUnsafe(r9, r10, r14)
+    r13 = CPySequenceTuple_GetItemUnsafe(abc, r10)
+    r14 = unbox(int, r13)
+    i = r14
+    r15 = CPyTagged_Str(i)
+    CPyList_SetItemUnsafe(r9, r10, r15)
 L3:
-    r15 = r10 + 1
-    r10 = r15
+    r16 = r10 + 1
+    r10 = r16
     goto L1
 L4:
-    r16 = PyFrozenSet_New(r9)
-    return r16
+    r17 = PyFrozenSet_New(r9)
+    return r17
 
 [case testFrozenSetFromRange6]
 from typing import FrozenSet
@@ -306,13 +308,13 @@ def fn():
     r8, abc :: tuple
     r9 :: native_int
     r10 :: list
-    r11 :: native_int
-    r12 :: bit
-    r13 :: object
-    r14, i :: int
-    r15 :: str
-    r16 :: native_int
-    r17 :: frozenset
+    r11, r12 :: native_int
+    r13 :: bit
+    r14 :: object
+    r15, i :: int
+    r16 :: str
+    r17 :: native_int
+    r18 :: frozenset
 L0:
     r0 = load_address PyRange_Type
     r1 = object 1
@@ -329,19 +331,20 @@ L0:
     r10 = PyList_New(r9)
     r11 = 0
 L1:
-    r12 = r11 < r9 :: signed
-    if r12 goto L2 else goto L4 :: bool
+    r12 = var_object_size abc
+    r13 = r11 < r12 :: signed
+    if r13 goto L2 else goto L4 :: bool
 L2:
-    r13 = CPySequenceTuple_GetItemUnsafe(abc, r11)
-    r14 = unbox(int, r13)
-    i = r14
-    r15 = CPyTagged_Str(i)
-    CPyList_SetItemUnsafe(r10, r11, r15)
+    r14 = CPySequenceTuple_GetItemUnsafe(abc, r11)
+    r15 = unbox(int, r14)
+    i = r15
+    r16 = CPyTagged_Str(i)
+    CPyList_SetItemUnsafe(r10, r11, r16)
 L3:
-    r16 = r11 + 1
-    r11 = r16
+    r17 = r11 + 1
+    r11 = r17
     goto L1
 L4:
-    r17 = PyFrozenSet_New(r10)
-    return r17
+    r18 = PyFrozenSet_New(r10)
+    return r18
 
diff --git a/mypyc/test-data/irbuild-lists.test b/mypyc/test-data/irbuild-lists.test
@@ -656,12 +656,12 @@ def fn():
     r6, abc :: tuple
     r7 :: native_int
     r8 :: list
-    r9 :: native_int
-    r10 :: bit
-    r11 :: object
-    r12, i :: int
-    r13 :: str
-    r14 :: native_int
+    r9, r10 :: native_int
+    r11 :: bit
+    r12 :: object
+    r13, i :: int
+    r14 :: str
+    r15 :: native_int
 L0:
     r0 = load_address PyRange_Type
     r1 = object 3
@@ -676,17 +676,18 @@ L0:
     r8 = PyList_New(r7)
     r9 = 0
 L1:
-    r10 = r9 < r7 :: signed
-    if r10 goto L2 else goto L4 :: bool
+    r10 = var_object_size abc
+    r11 = r9 < r10 :: signed
+    if r11 goto L2 else goto L4 :: bool
 L2:
-    r11 = CPySequenceTuple_GetItemUnsafe(abc, r9)
-    r12 = unbox(int, r11)
-    i = r12
-    r13 = CPyTagged_Str(i)
-    CPyList_SetItemUnsafe(r8, r9, r13)
+    r12 = CPySequenceTuple_GetItemUnsafe(abc, r9)
+    r13 = unbox(int, r12)
+    i = r13
+    r14 = CPyTagged_Str(i)
+    CPyList_SetItemUnsafe(r8, r9, r14)
 L3:
-    r14 = r9 + 1
-    r9 = r14
+    r15 = r9 + 1
+    r9 = r15
     goto L1
 L4:
     return r8
@@ -705,12 +706,12 @@ def fn():
     r7, abc :: tuple
     r8 :: native_int
     r9 :: list
-    r10 :: native_int
-    r11 :: bit
-    r12 :: object
-    r13, i :: int
-    r14 :: str
-    r15 :: native_int
+    r10, r11 :: native_int
+    r12 :: bit
+    r13 :: object
+    r14, i :: int
+    r15 :: str
+    r16 :: native_int
 L0:
     r0 = load_address PyRange_Type
     r1 = object 1
@@ -726,17 +727,18 @@ L0:
     r9 = PyList_New(r8)
     r10 = 0
 L1:
-    r11 = r10 < r8 :: signed
-    if r11 goto L2 else goto L4 :: bool
+    r11 = var_object_size abc
+    r12 = r10 < r11 :: signed
+    if r12 goto L2 else goto L4 :: bool
 L2:
-    r12 = CPySequenceTuple_GetItemUnsafe(abc, r10)
-    r13 = unbox(int, r12)
-    i = r13
-    r14 = CPyTagged_Str(i)
-    CPyList_SetItemUnsafe(r9, r10, r14)
+    r13 = CPySequenceTuple_GetItemUnsafe(abc, r10)
+    r14 = unbox(int, r13)
+    i = r14
+    r15 = CPyTagged_Str(i)
+    CPyList_SetItemUnsafe(r9, r10, r15)
 L3:
-    r15 = r10 + 1
-    r10 = r15
+    r16 = r10 + 1
+    r10 = r16
     goto L1
 L4:
     return r9
@@ -755,12 +757,12 @@ def fn():
     r8, abc :: tuple
     r9 :: native_int
     r10 :: list
-    r11 :: native_int
-    r12 :: bit
-    r13 :: object
-    r14, i :: int
-    r15 :: str
-    r16 :: native_int
+    r11, r12 :: native_int
+    r13 :: bit
+    r14 :: object
+    r15, i :: int
+    r16 :: str
+    r17 :: native_int
 L0:
     r0 = load_address PyRange_Type
     r1 = object 1
@@ -777,17 +779,18 @@ L0:
     r10 = PyList_New(r9)
     r11 = 0
 L1:
-    r12 = r11 < r9 :: signed
-    if r12 goto L2 else goto L4 :: bool
+    r12 = var_object_size abc
+    r13 = r11 < r12 :: signed
+    if r13 goto L2 else goto L4 :: bool
 L2:
-    r13 = CPySequenceTuple_GetItemUnsafe(abc, r11)
-    r14 = unbox(int, r13)
-    i = r14
-    r15 = CPyTagged_Str(i)
-    CPyList_SetItemUnsafe(r10, r11, r15)
+    r14 = CPySequenceTuple_GetItemUnsafe(abc, r11)
+    r15 = unbox(int, r14)
+    i = r15
+    r16 = CPyTagged_Str(i)
+    CPyList_SetItemUnsafe(r10, r11, r16)
 L3:
-    r16 = r11 + 1
-    r11 = r16
+    r17 = r11 + 1
+    r11 = r17
     goto L1
 L4:
     return r10
diff --git a/mypyc/test-data/irbuild-set.test b/mypyc/test-data/irbuild-set.test
@@ -901,21 +901,21 @@ L0:
     r6 = PySequence_Tuple(r5)
     abc = r6
     r7 = PySet_New(0)
-    r8 = var_object_size abc
-    r9 = 0
+    r8 = 0
 L1:
-    r10 = r9 < r8 :: signed
+    r9 = var_object_size abc
+    r10 = r8 < r9 :: signed
     if r10 goto L2 else goto L4 :: bool
 L2:
-    r11 = CPySequenceTuple_GetItemUnsafe(abc, r9)
+    r11 = CPySequenceTuple_GetItemUnsafe(abc, r8)
     r12 = unbox(int, r11)
     i = r12
     r13 = CPyTagged_Str(i)
     r14 = PySet_Add(r7, r13)
     r15 = r14 >= 0 :: signed
 L3:
-    r16 = r9 + 1
-    r9 = r16
+    r16 = r8 + 1
+    r8 = r16
     goto L1
 L4:
     return r7
@@ -953,21 +953,21 @@ L0:
     r7 = PySequence_Tuple(r6)
     abc = r7
     r8 = PySet_New(0)
-    r9 = var_object_size abc
-    r10 = 0
+    r9 = 0
 L1:
-    r11 = r10 < r9 :: signed
+    r10 = var_object_size abc
+    r11 = r9 < r10 :: signed
     if r11 goto L2 else goto L4 :: bool
 L2:
-    r12 = CPySequenceTuple_GetItemUnsafe(abc, r10)
+    r12 = CPySequenceTuple_GetItemUnsafe(abc, r9)
     r13 = unbox(int, r12)
     i = r13
     r14 = CPyTagged_Str(i)
     r15 = PySet_Add(r8, r14)
     r16 = r15 >= 0 :: signed
 L3:
-    r17 = r10 + 1
-    r10 = r17
+    r17 = r9 + 1
+    r9 = r17
     goto L1
 L4:
     return r8
@@ -1006,21 +1006,21 @@ L0:
     r8 = PySequence_Tuple(r7)
     abc = r8
     r9 = PySet_New(0)
-    r10 = var_object_size abc
-    r11 = 0
+    r10 = 0
 L1:
-    r12 = r11 < r10 :: signed
+    r11 = var_object_size abc
+    r12 = r10 < r11 :: signed
     if r12 goto L2 else goto L4 :: bool
 L2:
-    r13 = CPySequenceTuple_GetItemUnsafe(abc, r11)
+    r13 = CPySequenceTuple_GetItemUnsafe(abc, r10)
     r14 = unbox(int, r13)
     i = r14
     r15 = CPyTagged_Str(i)
     r16 = PySet_Add(r9, r15)
     r17 = r16 >= 0 :: signed
 L3:
-    r18 = r11 + 1
-    r11 = r18
+    r18 = r10 + 1
+    r10 = r18
     goto L1
 L4:
     return r9
diff --git a/mypyc/test-data/irbuild-tuple.test b/mypyc/test-data/irbuild-tuple.test
