setattro uses PyObjectPtr

youknowone · youknowone · commit e5a1c3b13749 · 2021-10-21T16:31:22.000+09:00
diff --git a/vm/src/builtins/object.rs b/vm/src/builtins/object.rs
@@ -161,12 +161,12 @@ impl PyBaseObject {
 
     #[pyslot]
     fn slot_setattro(
-        obj: &PyObjectRef,
+        obj: PyObjectPtr,
         attr_name: PyStrRef,
         value: Option<PyObjectRef>,
         vm: &VirtualMachine,
     ) -> PyResult<()> {
-        setattr(obj, attr_name, value, vm)
+        setattr(&*obj, attr_name, value, vm)
     }
 
     /// Return str(self).
diff --git a/vm/src/protocol/object.rs b/vm/src/protocol/object.rs
@@ -61,7 +61,7 @@ impl PyObjectRef {
                     ))
                 })?
         };
-        setattro(self, attr_name, attr_value, vm)
+        self.with_ptr(|zelf| setattro(zelf, attr_name, attr_value, vm))
     }
 
     // PyObject *PyObject_GenericGetAttr(PyObject *o, PyObject *name)
diff --git a/vm/src/types/slot.rs b/vm/src/types/slot.rs
@@ -133,7 +133,7 @@ pub(crate) type HashFunc = fn(PyObjectPtr, &VirtualMachine) -> PyResult<PyHash>;
 // CallFunc = GenericMethod
 pub(crate) type GetattroFunc = fn(PyObjectRef, PyStrRef, &VirtualMachine) -> PyResult;
 pub(crate) type SetattroFunc =
-    fn(&PyObjectRef, PyStrRef, Option<PyObjectRef>, &VirtualMachine) -> PyResult<()>;
+    fn(PyObjectPtr, PyStrRef, Option<PyObjectRef>, &VirtualMachine) -> PyResult<()>;
 pub(crate) type AsBufferFunc = fn(PyObjectPtr, &VirtualMachine) -> PyResult<PyBuffer>;
 pub(crate) type RichCompareFunc = fn(
     PyObjectPtr,
@@ -209,17 +209,18 @@ fn getattro_wrapper(zelf: PyObjectRef, name: PyStrRef, vm: &VirtualMachine) -> P
 }
 
 fn setattro_wrapper(
-    zelf: &PyObjectRef,
+    zelf: PyObjectPtr,
     name: PyStrRef,
     value: Option<PyObjectRef>,
     vm: &VirtualMachine,
 ) -> PyResult<()> {
+    let zelf = (*zelf).clone();
     match value {
         Some(value) => {
-            vm.call_special_method(zelf.clone(), "__setattr__", (name, value))?;
+            vm.call_special_method(zelf, "__setattr__", (name, value))?;
         }
         None => {
-            vm.call_special_method(zelf.clone(), "__delattr__", (name,))?;
+            vm.call_special_method(zelf, "__delattr__", (name,))?;
         }
     };
     Ok(())
@@ -712,7 +713,7 @@ pub trait SetAttr: PyValue {
     #[pyslot]
     #[inline]
     fn slot_setattro(
-        obj: &PyObjectRef,
+        obj: PyObjectPtr,
         name: PyStrRef,
         value: Option<PyObjectRef>,
         vm: &VirtualMachine,

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ impl PyObjectRef {`
`61`	`61`	`))`
`62`	`62`	`})?`
`63`	`63`	`};`
`64`		`- setattro(self, attr_name, attr_value, vm)`
	`64`	`+ self.with_ptr(\|zelf\| setattro(zelf, attr_name, attr_value, vm))`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`// PyObject PyObject_GenericGetAttr(PyObject o, PyObject *name)`