add type_check call to _check

dannasman · youknowone · commit ded6be584ef0 · 2025-03-30T14:30:03.000+09:00
diff --git a/vm/src/builtins/getset.rs b/vm/src/builtins/getset.rs
@@ -51,18 +51,19 @@ impl GetDescriptor for PyGetSet {
         _cls: Option<PyObjectRef>,
         vm: &VirtualMachine,
     ) -> PyResult {
-        let (zelf, obj) = match Self::_check(&zelf, obj, vm) {
-            Some(obj) => obj,
-            None => return Ok(zelf),
-        };
-        if let Some(ref f) = zelf.getter {
-            f(vm, obj)
+        if let Some(obj) = obj {
+            let (zelf, obj) = Self::_check(&zelf, obj, vm)?;
+            if let Some(ref f) = zelf.getter {
+                f(vm, obj)
+            } else {
+                Err(vm.new_attribute_error(format!(
+                    "attribute '{}' of '{}' objects is not readable",
+                    zelf.name,
+                    Self::class(&vm.ctx).name()
+                )))
+            }
         } else {
-            Err(vm.new_attribute_error(format!(
-                "attribute '{}' of '{}' objects is not readable",
-                zelf.name,
-                Self::class(&vm.ctx).name()
-            )))
+            Ok(zelf)
         }
     }
 }
diff --git a/vm/src/protocol/object.rs b/vm/src/protocol/object.rs
@@ -558,8 +558,8 @@ impl PyObject {
 
     // type protocol
     // PyObject *PyObject_Type(PyObject *o)
-    pub fn obj_type(&self) -> PyObjectRef {
-        self.class().to_owned().into()
+    pub fn obj_type(&self) -> PyTypeRef {
+        self.class().to_owned()
     }
 
     // int PyObject_TypeCheck(PyObject *o, PyTypeObject *type)
diff --git a/vm/src/types/slot.rs b/vm/src/types/slot.rs
@@ -925,22 +925,20 @@ pub trait GetDescriptor: PyPayload {
     #[inline]
     fn _check<'a>(
         zelf: &'a PyObject,
-        obj: Option<PyObjectRef>,
+        obj: PyObjectRef,
         vm: &VirtualMachine,
-    ) -> Option<(&'a Py<Self>, PyObjectRef)> {
+    ) -> PyResult<(&'a Py<Self>, PyObjectRef)> {
         // CPython descr_check
-        let obj = obj?;
-        // if (!PyObject_TypeCheck(obj, descr->d_type)) {
-        //     PyErr_Format(PyExc_TypeError,
-        //                  "descriptor '%V' for '%.100s' objects "
-        //                  "doesn't apply to a '%.100s' object",
-        //                  descr_name((PyDescrObject *)descr), "?",
-        //                  descr->d_type->slot_name,
-        //                  obj->ob_type->slot_name);
-        //     *pres = NULL;
-        //     return 1;
-        // } else {
-        Some((Self::_as_pyref(zelf, vm).unwrap(), obj))
+        if !obj.type_check(zelf.obj_type()) {
+            Err(vm.new_type_error(format!(
+                "descriptor {:?} for {} objects doesn't apply to a {} object",
+                zelf,
+                zelf.obj_type(),
+                obj.obj_type()
+            )))
+        } else {
+            Ok((Self::_as_pyref(zelf, vm).unwrap(), obj))
+        }
     }
 
     #[inline]

Original file line number	Diff line number	Diff line change
`@@ -558,8 +558,8 @@ impl PyObject {`
`558`	`558`
`559`	`559`	`// type protocol`
`560`	`560`	`// PyObject PyObject_Type(PyObject o)`
`561`		`- pub fn obj_type(&self) -> PyObjectRef {`
`562`		`- self.class().to_owned().into()`
	`561`	`+ pub fn obj_type(&self) -> PyTypeRef {`
	`562`	`+ self.class().to_owned()`
`563`	`563`	`}`
`564`	`564`
`565`	`565`	`// int PyObject_TypeCheck(PyObject o, PyTypeObject type)`