feat: handle native calls and primitive ops

Author: BobTheBuidler

mypyc/irbuild/for_helpers.py

@@ -1169,10 +1169,11 @@ def need_cleanup(self) -> bool:
         return True
 
     def init(self, index: Lvalue, func: Expression, iterable: Expression) -> None:
+        self.filter_func_def = func
         if isinstance(func, NameExpr) and isinstance(func.node, Var) and func.node.fullname == "builtins.None":
-            self.filter_func = None
+            self.filter_func_val = None
         else:
-            self.filter_func = self.builder.accept(func)
+            self.filter_func_val = self.builder.accept(func)
         self.iterable = iterable
         self.index = index
 
@@ -1198,11 +1199,20 @@ def begin_body(self) -> None:
         builder = self.builder
         line = self.line
         item = builder.read(builder.get_assignment_target(self.index), line)
-        if self.filter_func is None:
+
+        if self.filter_func_val is None:
             result = item
         else:
-            # TODO: implement logic to handle c calls of native functions
-            result = builder.py_call(self.filter_func, [item], line)
+            fake_call_expr = CallExpr(
+                self.filter_func_def,
+                [
+                    # this is unused in call_refexpr_with_args which is good because
+                    # we don't have an Expression to put here. But it works just fine.
+                ],
+                [ARG_POS],
+                [None],
+            )
+            result = builder.call_refexpr_with_args(fake_call_expr, self.filter_func_def, [item])
 
         # Now, filter: only enter the body if func(item) is truthy
         cont_block, rest_block = BasicBlock(), BasicBlock()

mypyc/test-data/irbuild-basic.test

@@ -3573,15 +3573,9 @@ def g(a):
     r5 :: bit
     r6 :: object
     r7, x :: int
-    r8 :: object
-    r9 :: object[1]
-    r10 :: object_ptr
-    r11 :: object
-    r12 :: i32
-    r13 :: bit
-    r14 :: bool
-    r15 :: int
-    r16 :: native_int
+    r8 :: bool
+    r9 :: int
+    r10 :: native_int
 L0:
     s = 0
     r0 = __main__.globals :: static
@@ -3596,23 +3590,16 @@ L2:
     r6 = list_get_item_unsafe a, r3
     r7 = unbox(int, r6)
     x = r7
-    r8 = box(int, x)
-    r9 = [r8]
-    r10 = load_address r9
-    r11 = PyObject_Vectorcall(r2, r10, 1, 0)
-    keep_alive r8
-    r12 = PyObject_IsTrue(r11)
-    r13 = r12 >= 0 :: signed
-    r14 = truncate r12: i32 to builtins.bool
-    if r14 goto L4 else goto L3 :: bool
+    r8 = f(x)
+    if r8 goto L4 else goto L3 :: bool
 L3:
     goto L5
 L4:
-    r15 = CPyTagged_Add(s, x)
-    s = r15
+    r9 = CPyTagged_Add(s, x)
+    s = r9
 L5:
-    r16 = r3 + 1
-    r3 = r16
+    r10 = r3 + 1
+    r3 = r10
     goto L1
 L6:
 L7:
@@ -3641,16 +3628,10 @@ def g(a):
     r3, r4 :: native_int
     r5 :: bit
     r6 :: object
-    r7, x :: int
-    r8 :: object
-    r9 :: object[1]
-    r10 :: object_ptr
-    r11 :: object
-    r12 :: i32
-    r13 :: bit
-    r14 :: bool
-    r15 :: int
-    r16 :: native_int
+    r7, x, r8 :: int
+    r9 :: bit
+    r10 :: int
+    r11 :: native_int
 L0:
     s = 0
     r0 = __main__.globals :: static
@@ -3665,23 +3646,17 @@ L2:
     r6 = list_get_item_unsafe a, r3
     r7 = unbox(int, r6)
     x = r7
-    r8 = box(int, x)
-    r9 = [r8]
-    r10 = load_address r9
-    r11 = PyObject_Vectorcall(r2, r10, 1, 0)
-    keep_alive r8
-    r12 = PyObject_IsTrue(r11)
-    r13 = r12 >= 0 :: signed
-    r14 = truncate r12: i32 to builtins.bool
-    if r14 goto L4 else goto L3 :: bool
+    r8 = f(x)
+    r9 = r8 != 0
+    if r9 goto L4 else goto L3 :: bool
 L3:
     goto L5
 L4:
-    r15 = CPyTagged_Add(s, x)
-    s = r15
+    r10 = CPyTagged_Add(s, x)
+    s = r10
 L5:
-    r16 = r3 + 1
-    r3 = r16
+    r11 = r3 + 1
+    r3 = r11
     goto L1
 L6:
 L7:
@@ -3713,15 +3688,10 @@ def g(a):
     r5 :: bit
     r6 :: object
     r7, x :: int
-    r8 :: object
-    r9 :: object[1]
-    r10 :: object_ptr
-    r11 :: object
-    r12 :: i32
-    r13 :: bit
-    r14 :: bool
-    r15 :: int
-    r16 :: native_int
+    r8 :: str
+    r9 :: bit
+    r10 :: int
+    r11 :: native_int
 L0:
     s = 0
     r0 = __main__.globals :: static
@@ -3736,23 +3706,17 @@ L2:
     r6 = list_get_item_unsafe a, r3
     r7 = unbox(int, r6)
     x = r7
-    r8 = box(int, x)
-    r9 = [r8]
-    r10 = load_address r9
-    r11 = PyObject_Vectorcall(r2, r10, 1, 0)
-    keep_alive r8
-    r12 = PyObject_IsTrue(r11)
-    r13 = r12 >= 0 :: signed
-    r14 = truncate r12: i32 to builtins.bool
-    if r14 goto L4 else goto L3 :: bool
+    r8 = f(x)
+    r9 = CPyStr_IsTrue(r8)
+    if r9 goto L4 else goto L3 :: bool
 L3:
     goto L5
 L4:
-    r15 = CPyTagged_Add(s, x)
-    s = r15
+    r10 = CPyTagged_Add(s, x)
+    s = r10
 L5:
-    r16 = r3 + 1
-    r3 = r16
+    r11 = r3 + 1
+    r3 = r11
     goto L1
 L6:
 L7: