Fix real_is_instance

youknowone · youknowone · commit 899abbb1f508 · 2025-06-30T09:38:14.000+09:00
diff --git a/vm/src/protocol/object.rs b/vm/src/protocol/object.rs
@@ -538,18 +538,17 @@ impl PyObject {
     /// Real isinstance check without going through __instancecheck__
     /// This is equivalent to CPython's _PyObject_RealIsInstance/object_isinstance
     pub fn real_is_instance(&self, cls: &PyObject, vm: &VirtualMachine) -> PyResult<bool> {
-        if let Ok(typ) = cls.try_to_ref::<PyType>(vm) {
+        if let Ok(cls) = cls.try_to_ref::<PyType>(vm) {
             // PyType_Check(cls) - cls is a type object
-            let mut retval = self.fast_isinstance(typ);
-
+            let mut retval = self.class().is_subtype(cls);
             if !retval {
                 // Check __class__ attribute, only masking AttributeError
                 if let Some(i_cls) =
                     vm.get_attribute_opt(self.to_owned(), identifier!(vm, __class__))?
                 {
                     if let Ok(i_cls_type) = PyTypeRef::try_from_object(vm, i_cls) {
                         if !i_cls_type.is(self.class()) {
-                            retval = i_cls_type.fast_issubclass(typ);
+                            retval = i_cls_type.is_subtype(cls);
                         }
                     }
                 }
@@ -568,11 +567,7 @@ impl PyObject {
             if let Some(i_cls) =
                 vm.get_attribute_opt(self.to_owned(), identifier!(vm, __class__))?
             {
-                if vm.is_none(&i_cls) {
-                    Ok(false)
-                } else {
-                    i_cls.abstract_issubclass(cls, vm)
-                }
+                i_cls.abstract_issubclass(cls, vm)
             } else {
                 Ok(false)
             }

Original file line number	Diff line number	Diff line change
`@@ -538,18 +538,17 @@ impl PyObject {`
`538`	`538`	`/// Real isinstance check without going through __instancecheck__`
`539`	`539`	`/// This is equivalent to CPython's _PyObject_RealIsInstance/object_isinstance`
`540`	`540`	`pub fn real_is_instance(&self, cls: &PyObject, vm: &VirtualMachine) -> PyResult<bool> {`
`541`		`- if let Ok(typ) = cls.try_to_ref::<PyType>(vm) {`
	`541`	`+ if let Ok(cls) = cls.try_to_ref::<PyType>(vm) {`
`542`	`542`	`// PyType_Check(cls) - cls is a type object`
`543`		`- let mut retval = self.fast_isinstance(typ);`
`544`		`-`
	`543`	`+ let mut retval = self.class().is_subtype(cls);`
`545`	`544`	`if !retval {`
`546`	`545`	`// Check __class__ attribute, only masking AttributeError`
`547`	`546`	`if let Some(i_cls) =`
`548`	`547`	`vm.get_attribute_opt(self.to_owned(), identifier!(vm, __class__))?`
`549`	`548`	`{`
`550`	`549`	`if let Ok(i_cls_type) = PyTypeRef::try_from_object(vm, i_cls) {`
`551`	`550`	`if !i_cls_type.is(self.class()) {`
`552`		`- retval = i_cls_type.fast_issubclass(typ);`
	`551`	`+ retval = i_cls_type.is_subtype(cls);`
`553`	`552`	`}`
`554`	`553`	`}`
`555`	`554`	`}`
`@@ -568,11 +567,7 @@ impl PyObject {`
`568`	`567`	`if let Some(i_cls) =`
`569`	`568`	`vm.get_attribute_opt(self.to_owned(), identifier!(vm, __class__))?`
`570`	`569`	`{`
`571`		`- if vm.is_none(&i_cls) {`
`572`		`- Ok(false)`
`573`		`- } else {`
`574`		`- i_cls.abstract_issubclass(cls, vm)`
`575`		`- }`
	`570`	`+ i_cls.abstract_issubclass(cls, vm)`
`576`	`571`	`} else {`
`577`	`572`	`Ok(false)`
`578`	`573`	`}`