Merge 56ba5f7f832b929bf98f5ef2f53c106501418dab into fed2bcea78b18cc8c3375bcc5c0cd734eb94496a

src/interpreter/vm.c

@@ -579,9 +579,8 @@ FrameResult VM__vectorcall(VM* self, uint16_t argc, uint16_t kwargc, bool opcall
     }
 
     if(p0->type == tp_type) {
-        py_Type p0_type = py_totype(p0);
         // [cls, NULL, args..., kwargs...]
-        py_Ref new_f = py_tpfindmagic(p0_type, __new__);
+        py_Ref new_f = py_tpfindmagic(py_totype(p0), __new__);
         assert(new_f && py_isnil(p0 + 1));
         bool is_default_new = new_f->type == tp_nativefunc && new_f->_cfunc == pk__object_new;
 
@@ -599,16 +598,14 @@ FrameResult VM__vectorcall(VM* self, uint16_t argc, uint16_t kwargc, bool opcall
         // NOTE: previously we use `get_unbound_method` but here we just use `tpfindmagic`
         // >> [cls, NULL, args..., kwargs...]
         // >> py_retval() is the new instance
-        py_Ref init_f = py_tpfindmagic(p0_type, __init__);
+        py_Ref init_f = py_tpfindmagic(py_totype(p0), __init__);
         if(init_f) {
-            if(py_isinstance(py_retval(), p0_type)) {
+            // do an inplace patch
-                // do an inplace patch
+            *p0 = *init_f;              // __init__
-                *p0 = *init_f;              // __init__
+            p0[1] = self->last_retval;  // self
-                p0[1] = self->last_retval;  // self
+            // [__init__, self, args..., kwargs...]
-                // [__init__, self, args..., kwargs...]
+            if(VM__vectorcall(self, argc, kwargc, false) == RES_ERROR) return RES_ERROR;
-                if(VM__vectorcall(self, argc, kwargc, false) == RES_ERROR) return RES_ERROR;
+            *py_retval() = p0[1];  // restore the new instance
-                *py_retval() = p0[1];  // restore the new instance
-            }
         } else {
             if(is_default_new) {
                 if(argc != 0 || kwargc != 0) {

tests/410_class_ex.py

@@ -168,13 +168,3 @@ class DerivedClass(BaseClass):
 
     
 assert DerivedClass.f() == 'BaseClass'
-
-# bad __init__
-class A:
-    def __new__(cls, *args, **kwargs):
-        return 1
-
-    def __init__(self):
-        assert False
-
-A()