Address more review comments

Author: p-sawicki

mypyc/irbuild/specialize.py

@@ -34,8 +34,10 @@
     Var,
 )
 from mypy.types import AnyType, TypeOfAny
+from mypyc.ir.class_ir import all_concrete_classes
 from mypyc.ir.ops import (
     BasicBlock,
+    Call,
     Extend,
     Integer,
     PrimitiveDescription,
@@ -1102,6 +1104,9 @@ def translate_object_new(builder: IRBuilder, expr: CallExpr, callee: RefExpr) ->
     method_args = fn.fitem.arg_names
     if isinstance(typ_arg, NameExpr) and len(method_args) > 0 and method_args[0] == typ_arg.name:
         subtype = builder.accept(expr.args[0])
+        classes = all_concrete_classes(ir)
+        if classes and len(classes) == 1:
+            return builder.add(Call(ir.setup, [subtype], expr.line))
         # Call a function that dynamically resolves the setup function of extension classes from the type object.
         # This is necessary because the setup involves default attribute initialization and setting up
         # the vtable which are specific to a given type and will not work if a subtype is created using

mypyc/lib-rt/generic_ops.c

@@ -79,7 +79,7 @@ PyObject *CPy_SetupObject(PyObject *type) {
         }
     }
     if (!def || !def->ml_name) {
-        PyErr_SetString(PyExc_RuntimeError, "Internal error: Unable to find object setup function");
+        PyErr_SetString(PyExc_RuntimeError, "Internal mypyc error: Unable to find object setup function");
         return NULL;
     }
 

mypyc/test-data/irbuild-classes.test

@@ -1685,6 +1685,13 @@ class Test:
         obj.val = val
         return obj
 
+class Test2:
+    def __new__(cls) -> Test2:
+        return super().__new__(cls)
+
+class Sub(Test2):
+    pass
+
 def fn() -> Test:
     return Test.__new__(Test, 42)
 
@@ -1712,15 +1719,20 @@ class NotTransformed:
 def Test.__new__(cls, val):
     cls :: object
     val :: int
-    r0 :: object
-    r1, obj :: __main__.Test
-    r2 :: bool
+    r0, obj :: __main__.Test
+    r1 :: bool
 L0:
-    r0 = CPy_SetupObject(cls)
-    r1 = cast(__main__.Test, r0)
-    obj = r1
-    obj.val = val; r2 = is_error
+    r0 = __mypyc__Test_setup(cls)
+    obj = r0
+    obj.val = val; r1 = is_error
     return obj
+def Test2.__new__(cls):
+    cls, r0 :: object
+    r1 :: __main__.Test2
+L0:
+    r0 = CPy_SetupObject(cls)
+    r1 = cast(__main__.Test2, r0)
+    return r1
 def fn():
     r0 :: object
     r1 :: __main__.Test
@@ -1731,14 +1743,12 @@ L0:
 def NewClassMethod.__new__(cls, val):
     cls :: object
     val :: int
-    r0 :: object
-    r1, obj :: __main__.NewClassMethod
-    r2 :: bool
+    r0, obj :: __main__.NewClassMethod
+    r1 :: bool
 L0:
-    r0 = CPy_SetupObject(cls)
-    r1 = cast(__main__.NewClassMethod, r0)
-    obj = r1
-    obj.val = val; r2 = is_error
+    r0 = __mypyc__NewClassMethod_setup(cls)
+    obj = r0
+    obj.val = val; r1 = is_error
     return obj
 def fn2():
     r0 :: object
@@ -1826,6 +1836,13 @@ class Test:
         obj.val = val
         return obj
 
+class Test2:
+    def __new__(cls) -> Test2:
+        return object.__new__(cls)
+
+class Sub(Test2):
+    pass
+
 def fn() -> Test:
     return Test.__new__(Test, 42)
 
@@ -1871,15 +1888,20 @@ def object_new_outside_class() -> None:
 def Test.__new__(cls, val):
     cls :: object
     val :: int
-    r0 :: object
-    r1, obj :: __main__.Test
-    r2 :: bool
+    r0, obj :: __main__.Test
+    r1 :: bool
 L0:
-    r0 = CPy_SetupObject(cls)
-    r1 = cast(__main__.Test, r0)
-    obj = r1
-    obj.val = val; r2 = is_error
+    r0 = __mypyc__Test_setup(cls)
+    obj = r0
+    obj.val = val; r1 = is_error
     return obj
+def Test2.__new__(cls):
+    cls, r0 :: object
+    r1 :: __main__.Test2
+L0:
+    r0 = CPy_SetupObject(cls)
+    r1 = cast(__main__.Test2, r0)
+    return r1
 def fn():
     r0 :: object
     r1 :: __main__.Test
@@ -1890,14 +1912,12 @@ L0:
 def NewClassMethod.__new__(cls, val):
     cls :: object
     val :: int
-    r0 :: object
-    r1, obj :: __main__.NewClassMethod
-    r2 :: bool
+    r0, obj :: __main__.NewClassMethod
+    r1 :: bool
 L0:
-    r0 = CPy_SetupObject(cls)
-    r1 = cast(__main__.NewClassMethod, r0)
-    obj = r1
-    obj.val = val; r2 = is_error
+    r0 = __mypyc__NewClassMethod_setup(cls)
+    obj = r0
+    obj.val = val; r1 = is_error
     return obj
 def fn2():
     r0 :: object