Add inline primitive for len

Author: JukkaL

mypyc/lib-rt/librt_strings.c

@@ -415,7 +415,6 @@ librt_strings_module_exec(PyObject *m)
         (void *)BytesWriter_append_internal,
         (void *)_grow_buffer,
         (void *)BytesWriter_type_internal,
-        (void *)BytesWriter_len_internal,
         (void *)BytesWriter_truncate_internal,
     };
     PyObject *c_api_object = PyCapsule_New((void *)librt_strings_api, "librt.strings._C_API", NULL);

mypyc/lib-rt/librt_strings.h

@@ -24,7 +24,7 @@ import_librt_strings(void)
 
 // Number of functions in the capsule API. If you add a new function, also increase
 // LIBRT_STRINGS_API_VERSION.
-#define LIBRT_STRINGS_API_LEN 9
+#define LIBRT_STRINGS_API_LEN 8
 
 static void *LibRTStrings_API[LIBRT_STRINGS_API_LEN];
 
@@ -46,8 +46,7 @@ typedef struct {
 #define LibRTStrings_BytesWriter_append_internal (*(char (*)(PyObject *source, uint8_t value)) LibRTStrings_API[4])
 #define LibRTStrings_ByteWriter_grow_buffer_internal (*(bool (*)(BytesWriterObject *obj, Py_ssize_t size)) LibRTStrings_API[5])
 #define LibRTStrings_BytesWriter_type_internal (*(PyTypeObject* (*)(void)) LibRTStrings_API[6])
-#define LibRTStrings_BytesWriter_len_internal (*(CPyTagged (*)(PyObject *self)) LibRTStrings_API[7])
-#define LibRTStrings_BytesWriter_truncate_internal (*(char (*)(PyObject *self, int64_t size)) LibRTStrings_API[8])
+#define LibRTStrings_BytesWriter_truncate_internal (*(char (*)(PyObject *self, int64_t size)) LibRTStrings_API[7])
 
 static int
 import_librt_strings(void)
@@ -134,6 +133,12 @@ CPyBytesWriter_Write(PyObject *obj, PyObject *value) {
     return CPY_NONE;
 }
 
+static inline CPyTagged
+CPyBytesWriter_Len(PyObject *obj) {
+    BytesWriterObject *self = (BytesWriterObject *)obj;
+    return (CPyTagged)self->len << 1;
+}
+
 #endif  // MYPYC_EXPERIMENTAL
 
 #endif  // LIBRT_STRINGS_H

mypyc/primitives/librt_strings_ops.py

@@ -66,7 +66,7 @@
     name="builtins.len",
     arg_types=[bytes_writer_rprimitive],
     return_type=short_int_rprimitive,
-    c_function_name="LibRTStrings_BytesWriter_len_internal",
+    c_function_name="CPyBytesWriter_Len",
     error_kind=ERR_NEVER,
     experimental=True,
     dependencies=[LIBRT_STRINGS],

mypyc/test-data/irbuild-librt-strings.test

@@ -29,9 +29,9 @@ def bytes_writer_basics():
 L0:
     r0 = LibRTStrings_BytesWriter_internal()
     b = r0
-    r1 = LibRTStrings_BytesWriter_append_internal(b, 1)
+    r1 = CPyBytesWriter_Append(b, 1)
     r2 = b'foo'
-    r3 = LibRTStrings_BytesWriter_write_internal(b, r2)
+    r3 = CPyBytesWriter_Write(b, r2)
     n = 4
     r4 = n & 1
     r5 = r4 == 0
@@ -55,6 +55,6 @@ def bytes_writer_len(b):
     r0 :: short_int
     r1 :: i64
 L0:
-    r0 = LibRTStrings_BytesWriter_len_internal(b)
+    r0 = CPyBytesWriter_Len(b)
     r1 = r0 >> 1
     return r1