Fix real_is_instance

youknowone · youknowone · commit 76c7882cb126 · 2025-06-30T09:30:51.000+09:00
diff --git a/vm/src/protocol/object.rs b/vm/src/protocol/object.rs
@@ -535,18 +535,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);
                         }
                     }
                 }
@@ -565,11 +564,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
`@@ -535,18 +535,17 @@ impl PyObject {`
`535`	`535`	`/// Real isinstance check without going through __instancecheck__`
`536`	`536`	`/// This is equivalent to CPython's _PyObject_RealIsInstance/object_isinstance`
`537`	`537`	`pub fn real_is_instance(&self, cls: &PyObject, vm: &VirtualMachine) -> PyResult<bool> {`
`538`		`- if let Ok(typ) = cls.try_to_ref::<PyType>(vm) {`
	`538`	`+ if let Ok(cls) = cls.try_to_ref::<PyType>(vm) {`
`539`	`539`	`// PyType_Check(cls) - cls is a type object`
`540`		`- let mut retval = self.fast_isinstance(typ);`
`541`		`-`
	`540`	`+ let mut retval = self.class().is_subtype(cls);`
`542`	`541`	`if !retval {`
`543`	`542`	`// Check __class__ attribute, only masking AttributeError`
`544`	`543`	`if let Some(i_cls) =`
`545`	`544`	`vm.get_attribute_opt(self.to_owned(), identifier!(vm, __class__))?`
`546`	`545`	`{`
`547`	`546`	`if let Ok(i_cls_type) = PyTypeRef::try_from_object(vm, i_cls) {`
`548`	`547`	`if !i_cls_type.is(self.class()) {`
`549`		`- retval = i_cls_type.fast_issubclass(typ);`
	`548`	`+ retval = i_cls_type.is_subtype(cls);`
`550`	`549`	`}`
`551`	`550`	`}`
`552`	`551`	`}`
`@@ -565,11 +564,7 @@ impl PyObject {`
`565`	`564`	`if let Some(i_cls) =`
`566`	`565`	`vm.get_attribute_opt(self.to_owned(), identifier!(vm, __class__))?`
`567`	`566`	`{`
`568`		`- if vm.is_none(&i_cls) {`
`569`		`- Ok(false)`
`570`		`- } else {`
`571`		`- i_cls.abstract_issubclass(cls, vm)`
`572`		`- }`
	`567`	`+ i_cls.abstract_issubclass(cls, vm)`
`573`	`568`	`} else {`
`574`	`569`	`Ok(false)`
`575`	`570`	`}`