Add primitive for bytearray()

Author: JukkaL

mypyc/ir/deps.py

@@ -51,3 +51,4 @@ def get_header(self) -> str:
 
 BYTES_EXTRA_OPS: Final = SourceDep("bytes_extra_ops.c")
 BYTES_WRITER_EXTRA_OPS: Final = SourceDep("byteswriter_extra_ops.c")
+BYTEARRAY_EXTRA_OPS: Final = SourceDep("bytearray_extra_ops.c")

mypyc/lib-rt/bytearray_extra_ops.c

@@ -0,0 +1,5 @@
+#include "bytearray_extra_ops.h"
+
+PyObject *CPyByteArray_New(void) {
+    return PyByteArray_FromStringAndSize(NULL, 0);
+}

mypyc/lib-rt/bytearray_extra_ops.h

@@ -0,0 +1,10 @@
+#ifndef MYPYC_BYTEARRAY_EXTRA_OPS_H
+#define MYPYC_BYTEARRAY_EXTRA_OPS_H
+
+#include <Python.h>
+#include "CPy.h"
+
+// Construct empty bytearray
+PyObject *CPyByteArray_New(void);
+
+#endif

mypyc/primitives/bytearray_ops.py

@@ -1,10 +1,16 @@
-"""Primitive bytearray ops."""
+"""Primitive bytearray ops.
+
+NOTE: Most of these should be added to bytearray_extra_ops.c, which requires the
+      BYTEARRAY_EXTRA_OPS primitive dependency, since these are used relatively rarely and we
+      don't want to compile them unless needed.
+"""
 
 from __future__ import annotations
 
+from mypyc.ir.deps import BYTEARRAY_EXTRA_OPS
 from mypyc.ir.ops import ERR_MAGIC, ERR_NEVER
 from mypyc.ir.rtypes import bit_rprimitive, bytearray_rprimitive, object_rprimitive
-from mypyc.primitives.registry import function_op, load_address_op
+from mypyc.primitives.registry import function_op, load_address_op, custom_primitive_op
 
 # Get the 'bytearray' type object.
 load_address_op(name="builtins.bytearray", type=object_rprimitive, src="PyByteArray_Type")
@@ -16,10 +22,20 @@
     return_type=bytearray_rprimitive,
     c_function_name="PyByteArray_FromObject",
     error_kind=ERR_MAGIC,
+    dependencies=[BYTEARRAY_EXTRA_OPS],
+)
+
+# bytearray() -- construct empty bytearray
+function_op(
+    name="builtins.bytearray",
+    arg_types=[],
+    return_type=bytearray_rprimitive,
+    c_function_name="CPyByteArray_New",
+    error_kind=ERR_MAGIC,
 )
 
-# translate isinstance(obj, bytearray)
-isinstance_bytearray = function_op(
+# isinstance(obj, bytearray)
+isinstance_bytearray = custom_primitive_op(
     name="builtins.isinstance",
     arg_types=[object_rprimitive],
     return_type=bit_rprimitive,

mypyc/test-data/irbuild-bytes.test

@@ -48,20 +48,17 @@ def f(s: str, num: int) -> None:
 def f(s, num):
     s :: str
     num :: int
-    r0, r1 :: object
-    r2, a, r3, b :: bytearray
-    r4 :: object
-    r5, c :: bytearray
+    r0, a, r1, b :: bytearray
+    r2 :: object
+    r3, c :: bytearray
 L0:
-    r0 = load_address PyByteArray_Type
-    r1 = PyObject_Vectorcall(r0, 0, 0, 0)
-    r2 = cast(bytearray, r1)
-    a = r2
-    r3 = PyByteArray_FromObject(s)
-    b = r3
-    r4 = box(int, num)
-    r5 = PyByteArray_FromObject(r4)
-    c = r5
+    r0 = CPyByteArray_New()
+    a = r0
+    r1 = PyByteArray_FromObject(s)
+    b = r1
+    r2 = box(int, num)
+    r3 = PyByteArray_FromObject(r2)
+    c = r3
     return 1
 
 [case testBytesEquality]

mypyc/test-data/run-bytes.test

@@ -260,6 +260,10 @@ from typing import Any
 from testutil import assertRaises
 
 def test_basics() -> None:
+    brr0 = bytearray()
+    assert brr0 == bytearray(b'')
+    assert brr0 == b''
+    assert len(brr0) == 0
     brr1 = bytearray(3)
     assert brr1 == bytearray(b'\x00\x00\x00')
     assert brr1 == b'\x00\x00\x00'