Don't use a custom type slot return converter; instead special case type slot functions during generation

Author: erlend-aasland

Lib/test/clinic.test.c

@@ -5350,7 +5350,6 @@ Test___init__(PyObject *self, PyObject *args, PyObject *kwargs)
 {
     int return_value = -1;
     PyTypeObject *base_tp = TestType;
-    long _return_value;
 
     if ((Py_IS_TYPE(self, base_tp) ||
          Py_TYPE(self)->tp_new == base_tp->tp_new) &&
@@ -5362,19 +5361,15 @@ Test___init__(PyObject *self, PyObject *args, PyObject *kwargs)
         !_PyArg_NoKeywords("Test", kwargs)) {
         goto exit;
     }
-    _return_value = Test___init___impl((TestObj *)self);
-    if ((_return_value == -1) && PyErr_Occurred()) {
-        goto exit;
-    }
-    return_value = PyLong_FromLong(_return_value);
+    return_value = Test___init___impl((TestObj *)self);
 
 exit:
     return return_value;
 }
 
 static long
 Test___init___impl(TestObj *self)
-/*[clinic end generated code: output=daf6ee12c4e443fb input=311af0dc7f17e8e9]*/
+/*[clinic end generated code: output=9f3704989ab1f6eb input=311af0dc7f17e8e9]*/
 
 
 /*[clinic input]

Lib/test/test_clinic.py

@@ -2651,7 +2651,6 @@ def test_cli_converters(self):
                 long()
                 Py_ssize_t()
                 size_t()
-                type_slot_int()
                 unsigned_int()
                 unsigned_long()
 
@@ -3937,7 +3936,7 @@ def test_Function_and_Parameter_reprs(self):
             cls=None,
             c_basename=None,
             full_name='foofoo',
-            return_converter=clinic.type_slot_int_return_converter(),
+            return_converter=clinic.int_return_converter(),
             kind=clinic.FunctionKind.METHOD_INIT,
             coexist=False
         )

Tools/clinic/clinic.py

@@ -1612,7 +1612,8 @@ def render_function(
         for converter in converters:
             converter.set_template_dict(template_dict)
 
-        f.return_converter.render(f, data)
+        if f.kind not in {SETTER, METHOD_INIT}:
+            f.return_converter.render(f, data)
         template_dict['impl_return_type'] = f.return_converter.type
 
         template_dict['declarations'] = libclinic.format_escape("\n".join(data.declarations))
@@ -4558,15 +4559,6 @@ class int_return_converter(long_return_converter):
     cast = '(long)'
 
 
-class type_slot_int_return_converter(long_return_converter):
-    """Special return converter for type slots functions that return int."""
-    type = 'int'
-    cast = '(long)'
-
-    def render(self, function: Function, data: CRenderData) -> None:
-        pass
-
-
 class unsigned_long_return_converter(long_return_converter):
     type = 'unsigned long'
     conversion_fn = 'PyLong_FromUnsignedLong'
@@ -5098,7 +5090,7 @@ def resolve_return_converter(
                 fail(f"Badly formed annotation for {full_name!r}: {forced_converter!r}")
 
         if self.kind in {METHOD_INIT, SETTER}:
-            return type_slot_int_return_converter()
+            return int_return_converter()
         return CReturnConverter()
 
     def parse_cloned_function(self, names: FunctionNames, existing: str) -> None: