Merge branch 'master' into for-loop-len-cache

Author: BobTheBuidler

mypyc/irbuild/for_helpers.py

@@ -796,20 +796,6 @@ class ForSequence(ForGenerator):
 
     length_reg: Value | AssignmentTarget | None
 
-    def __init__(
-        self,
-        builder: IRBuilder,
-        index: Lvalue,
-        body_block: BasicBlock,
-        loop_exit: BasicBlock,
-        line: int,
-        nested: bool,
-        length: Value | None = None,
-    ) -> None:
-        super().__init__(builder, index, body_block, loop_exit, line, nested)
-        self.length = length
-        """A Value representing the length of the sequence, if known."""
-
     def init(self, expr_reg: Value, target_type: RType, reverse: bool) -> None:
         assert is_sequence_rprimitive(expr_reg.type), expr_reg
         builder = self.builder

mypyc/test-data/irbuild-generics.test

@@ -711,17 +711,18 @@ L0:
     r0 = __mypyc_self__.__mypyc_env__
     r1 = var_object_size args
     r2 = PyList_New(r1)
-    r3 = 0
+    r3 = var_object_size args
+    r4 = 0
 L1:
-    r4 = r3 < r1 :: signed
-    if r4 goto L2 else goto L4 :: bool
+    r5 = r4 < r3 :: signed
+    if r5 goto L2 else goto L4 :: bool
 L2:
-    r5 = CPySequenceTuple_GetItemUnsafe(args, r3)
-    x = r5
-    CPyList_SetItemUnsafe(r2, r3, x)
+    r6 = CPySequenceTuple_GetItemUnsafe(args, r4)
+    x = r6
+    CPyList_SetItemUnsafe(r2, r4, x)
 L3:
-    r6 = r3 + 1
-    r3 = r6
+    r7 = r4 + 1
+    r4 = r7
     goto L1
 L4:
     can_listcomp = r2

mypyc/test-data/irbuild-tuple.test

@@ -293,27 +293,31 @@ def test():
     r3 :: tuple
     r4 :: native_int
     r5 :: bit
-    r6, x, r7 :: str
-    r8 :: native_int
+    r6 :: native_int
+    r7 :: bit
+    r8, x, r9 :: str
+    r10 :: native_int
     a :: tuple
 L0:
     r0 = 'abc'
     source = r0
     r1 = CPyStr_Size_size_t(source)
     r2 = r1 >= 0 :: signed
     r3 = PyTuple_New(r1)
-    r4 = 0
+    r4 = CPyStr_Size_size_t(source)
+    r5 = r4 >= 0 :: signed
+    r6 = 0
 L1:
-    r5 = r4 < r1 :: signed
-    if r5 goto L2 else goto L4 :: bool
+    r7 = r6 < r4 :: signed
+    if r7 goto L2 else goto L4 :: bool
 L2:
-    r6 = CPyStr_GetItemUnsafe(source, r4)
-    x = r6
-    r7 = f2(x)
-    CPySequenceTuple_SetItemUnsafe(r3, r4, r7)
+    r8 = CPyStr_GetItemUnsafe(source, r6)
+    x = r8
+    r9 = f2(x)
+    CPySequenceTuple_SetItemUnsafe(r3, r6, r9)
 L3:
-    r8 = r4 + 1
-    r4 = r8
+    r10 = r6 + 1
+    r6 = r10
     goto L1
 L4:
     a = r3
@@ -738,7 +742,8 @@ def test(source):
 L0:
     r0 = var_object_size source
     r1 = PyTuple_New(r0)
-    r2 = 0
+    r2 = var_object_size source
+    r3 = 0
 L1:
     r3 = r2 < r0 :: signed
     if r3 goto L2 else goto L4 :: bool