fix: run tests

Author: BobTheBuidler

mypyc/irbuild/for_helpers.py

@@ -1184,22 +1184,26 @@ def init(self, index: Lvalue, func: Expression, iterable: Expression) -> None:
         )
 
     def gen_condition(self) -> None:
-        builder = self.builder
-        line = self.line
-        # First, get the next item from the sub-generator
         self.gen.gen_condition()
-        # Now, filter: only enter the body if func(item) is truthy
-        filter_block = BasicBlock()
-        builder.activate_block(filter_block)
+
+    def begin_body(self) -> None:
+        # 1. Assign the next item to the loop variable
         self.gen.begin_body()
+
+        # 2. Call the filter function
+        builder = self.builder
+        line = self.line
         item = builder.read(builder.get_assignment_target(self.index), line)
         # TODO: implement logic to handle c calls of native functions
         result = builder.py_call(self.filter_func, [item], line)
-        builder.add_bool_branch(result, self.body_block, self.loop_exit)
 
-    def begin_body(self) -> None:
-        # The item is already assigned to self.index by the sub-generator.
-        pass
+        # Now, filter: only enter the body if func(item) is truthy
+        cont_block, rest_block = BasicBlock(), BasicBlock()
+        builder.add_bool_branch(result, rest_block, cont_block)
+        builder.activate_block(cont_block)
+        builder.nonlocal_control[-1].gen_continue(builder, line)
+        builder.goto_and_activate(rest_block)
+        # At this point, the rest of the loop body (user code) will be emitted
 
     def gen_step(self) -> None:
         self.gen.gen_step()

mypyc/test-data/irbuild-basic.test

@@ -3591,7 +3591,7 @@ L0:
 L1:
     r4 = var_object_size a
     r5 = r3 < r4 :: signed
-    if r5 goto L3 else goto L5 :: bool
+    if r5 goto L2 else goto L6 :: bool
 L2:
     r6 = list_get_item_unsafe a, r3
     r7 = unbox(int, r6)
@@ -3604,14 +3604,16 @@ L2:
     r12 = PyObject_IsTrue(r11)
     r13 = r12 >= 0 :: signed
     r14 = truncate r12: i32 to builtins.bool
-    if r14 goto L3 else goto L5 :: bool
+    if r14 goto L4 else goto L3 :: bool
 L3:
+    goto L5
+L4:
     r15 = CPyTagged_Add(s, x)
     s = r15
-L4:
+L5:
     r16 = r3 + 1
     r3 = r16
     goto L1
-L5:
 L6:
+L7:
     return s

mypyc/test-data/run-loops.test

@@ -579,6 +579,8 @@ def f(a: list[int]) -> int:
         s += x
     return s
 
+[file driver.py]
+from native import f
 print(f([1, 2, 3, 4, 5, 6]))
 print(f([1, 3, 5]))
 print(f([]))
@@ -595,6 +597,8 @@ def f(a: list[int]) -> int:
         s += x
     return s
 
+[file driver.py]
+from native import f
 print(f([5, 15, 25]))
 print(f([]))