test with None

Author: BobTheBuidler

mypyc/irbuild/for_helpers.py

@@ -22,6 +22,7 @@
     SetExpr,
     TupleExpr,
     TypeAlias,
+    Var,
 )
 from mypyc.ir.ops import (
     ERR_NEVER,
@@ -1168,7 +1169,10 @@ def need_cleanup(self) -> bool:
         return True
 
     def init(self, index: Lvalue, func: Expression, iterable: Expression) -> None:
-        self.filter_func = self.builder.accept(func)
+        if isinstance(func, NameExpr) and isinstance(func.node, Var) and func.node.fullname == "builtins.None":
+            self.filter_func = None
+        else:
+            self.filter_func = self.builder.accept(func)
         self.iterable = iterable
         self.index = index
 
@@ -1194,8 +1198,11 @@ def begin_body(self) -> None:
         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)
+        if self.filter_func is None:
+            result = item
+        else:
+            # TODO: implement logic to handle c calls of native functions
+            result = builder.py_call(self.filter_func, [item], line)
 
         # Now, filter: only enter the body if func(item) is truthy
         cont_block, rest_block = BasicBlock(), BasicBlock()

mypyc/test-data/irbuild-basic.test

@@ -3617,3 +3617,47 @@ L5:
 L6:
 L7:
     return s
+
+[case testForFilterNone]
+def f(a: list[int]) -> int:
+    c = 0
+    for x in filter(None, a):
+        c += 1
+    return 0
+
+[out]
+def f(a):
+    a :: list
+    c :: int
+    r0, r1 :: native_int
+    r2 :: bit
+    r3 :: object
+    r4, x :: int
+    r5 :: bit
+    r6 :: int
+    r7 :: native_int
+L0:
+    c = 0
+    r0 = 0
+L1:
+    r1 = var_object_size a
+    r2 = r0 < r1 :: signed
+    if r2 goto L2 else goto L6 :: bool
+L2:
+    r3 = list_get_item_unsafe a, r0
+    r4 = unbox(int, r3)
+    x = r4
+    r5 = x != 0
+    if r5 goto L4 else goto L3 :: bool
+L3:
+    goto L5
+L4:
+    r6 = CPyTagged_Add(c, 2)
+    c = r6
+L5:
+    r7 = r0 + 1
+    r0 = r7
+    goto L1
+L6:
+L7:
+    return 0

mypyc/test-data/run-loops.test

@@ -590,6 +590,20 @@ print(f([]))
 0
 0
 
+[case testRunForFilterNone]
+def f(a: list[int]) -> int:
+    c = 0
+    for x in filter(None, a):
+        c += 1
+    return c
+
+[file driver.py]
+from native import f
+print(f([0, 1, 2, 3, 4, 5, 6]))
+
+[out]
+6
+
 [case testRunForFilterEdgeCases]
 def f(a: list[int]) -> int:
     s = 0