PyTuple_GET_EMPTY

Author: BobTheBuidler

mypyc/irbuild/ll_builder.py

@@ -187,8 +187,8 @@
     unicode_compare,
 )
 from mypyc.primitives.tuple_ops import (
+    expand_empty_tuple_macro,
     list_tuple_op,
-    load_empty_tuple_constant_op,
     new_tuple_op,
     new_tuple_with_length_op,
     sequence_tuple_op,
@@ -2364,7 +2364,7 @@ def new_tuple(self, items: list[Value], line: int) -> Value:
             size: Value = Integer(len(items), c_pyssize_t_rprimitive)
             return self.call_c(new_tuple_op, [size] + items, line)
         else:
-            return self.call_c(load_empty_tuple_constant_op, [], line)
+            return self.call_c(expand_empty_tuple_macro, [], line)
 
     def new_tuple_with_length(self, length: Value, line: int) -> Value:
         """This function returns an uninitialized tuple.

mypyc/lib-rt/CPy.h

@@ -64,14 +64,6 @@ typedef struct tuple_T4CIOO {
 } tuple_T4CIOO;
 #endif
 
-// System-wide empty tuple constant
-extern PyObject * __mypyc_empty_tuple__;
-
-static inline PyObject *_CPyTuple_LoadEmptyTupleConstant() {
-    // do tests still pass if I comment this out? empty tuple singleton is not tracked by gc
-    // Py_INCREF(__mypyc_empty_tuple__);
-    return __mypyc_empty_tuple__;
-}
 
 // Native object operations
 

mypyc/lib-rt/init.c

@@ -13,14 +13,4 @@ PyObject * __mypyc_empty_tuple__ = NULL;
 // things at load time.
 void CPy_Init(void) {
     _CPy_ExcDummyStruct.ob_base.ob_type = &PyBaseObject_Type;
-
-    // Initialize system-wide empty tuple constant
-    if (__mypyc_empty_tuple__ == NULL) {
-        __mypyc_empty_tuple__ = PyTuple_New(0);
-        if (!__mypyc_empty_tuple__) {
-            PyErr_SetString(PyExc_RuntimeError, "Failed to initialize __mypyc_empty_tuple__");
-            return;
-        }
-        Py_INCREF(__mypyc_empty_tuple__);
-    }
 }

mypyc/primitives/tuple_ops.py

@@ -55,10 +55,10 @@
     error_kind=ERR_MAGIC,
 )
 
-load_empty_tuple_constant_op = custom_op(
+expand_empty_tuple_macro = custom_op(
     arg_types=[],
     return_type=tuple_rprimitive,
-    c_function_name="_CPyTuple_LoadEmptyTupleConstant",
+    c_function_name="PyTuple_GET_EMPTY",
     error_kind=ERR_NEVER,
 )
 

mypyc/test-data/irbuild-basic.test

@@ -1758,7 +1758,7 @@ L0:
     r10 = PyDict_New()
     r11 = CPyDict_UpdateInDisplay(r10, r6)
     r12 = r11 >= 0 :: signed
-    r13 = _CPyTuple_LoadEmptyTupleConstant()
+    r13 = PyTuple_GET_EMPTY()
     r14 = PyObject_Call(r9, r13, r10)
     r15 = unbox(tuple[int, int, int], r14)
     return r15

mypyc/test-data/irbuild-classes.test

@@ -297,7 +297,7 @@ L2:
     r27 = CPyType_FromTemplate(r26, r24, r25)
     r28 = C_trait_vtable_setup()
     r29 = '__mypyc_attrs__'
-    r30 = _CPyTuple_LoadEmptyTupleConstant()
+    r30 = PyTuple_GET_EMPTY()
     r31 = PyObject_SetAttr(r27, r29, r30)
     r32 = r31 >= 0 :: signed
     __main__.C = r27 :: type
@@ -310,7 +310,7 @@ L2:
     r39 = __main__.S_template :: type
     r40 = CPyType_FromTemplate(r39, r37, r38)
     r41 = '__mypyc_attrs__'
-    r42 = _CPyTuple_LoadEmptyTupleConstant()
+    r42 = PyTuple_GET_EMPTY()
     r43 = PyObject_SetAttr(r40, r41, r42)
     r44 = r43 >= 0 :: signed
     __main__.S = r40 :: type