Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2026-08-05 05:37:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix a bug of __init__

Browse Source
This commit is contained in:
blueloveTH 2026-07-29 19:16:24 +08:00
parent fed2bcea78
commit 71f06c4ff1
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/interpreter/vm.c
View File

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

12
tests/410_class_ex.py
View File

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