Enhance object dictionary handling in type and object modules

key262yek · hbina · commit 79d70e3d39a7 · 2025-03-23T11:18:11.000+08:00
- Modify set_dict method to allow assigning dict to objects without existing dict
- Update error handling in object_set_dict to provide more precise error message
- Refactor type module to correctly handle dictionary assignment
diff --git a/vm/src/builtins/object.rs b/vm/src/builtins/object.rs
@@ -496,9 +496,13 @@ pub fn object_get_dict(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyDict
         .ok_or_else(|| vm.new_attribute_error("This object has no __dict__".to_owned()))
 }
 
-pub fn object_set_dict(obj: PyObjectRef, dict: PySetterValue<PyDictRef>, vm: &VirtualMachine) -> PyResult<()> {
+pub fn object_set_dict(
+    obj: PyObjectRef,
+    dict: PySetterValue<PyDictRef>,
+    vm: &VirtualMachine,
+) -> PyResult<()> {
     obj.set_dict(dict)
-        .map_err(|_| vm.new_attribute_error("This object has no __dict__".to_owned()))
+        .map_err(|_| vm.new_attribute_error("This object has no __dict__ to delete".to_owned()))
 }
 
 pub fn init(ctx: &Context) {
diff --git a/vm/src/builtins/type.rs b/vm/src/builtins/type.rs
@@ -1288,7 +1288,7 @@ fn subtype_set_dict(obj: PyObjectRef, value: PyObjectRef, vm: &VirtualMachine) -
             descr_set(&descr, obj, PySetterValue::Assign(value), vm)
         }
         None => {
-            object::object_set_dict(obj, PySetterValue::Delete, vm)?;
+            object::object_set_dict(obj, PySetterValue::Assign(value.try_into_value(vm)?), vm)?;
             Ok(())
         }
     }
diff --git a/vm/src/object/core.rs b/vm/src/object/core.rs
@@ -712,21 +712,27 @@ impl PyObject {
 
     /// Set the dict field. Returns `Err(dict)` if this object does not have a dict field
     /// in the first place.
-    pub fn set_dict(&self, dict: PySetterValue<PyDictRef>) -> Result<(), PyDictRef> {
+    pub fn set_dict(&self, dict: PySetterValue<PyDictRef>) -> Result<(), PySetterValue<PyDictRef>> {
         match (self.instance_dict(), dict) {
             (Some(d), PySetterValue::Assign(dict)) => {
                 d.set(dict);
                 Ok(())
             }
-            (None, PySetterValue::Assign(dict)) => Err(dict),
+            (None, PySetterValue::Assign(dict)) => {
+                unsafe {
+                    let ptr = self as *const _ as *mut PyObject;
+                    (*ptr).0.dict = Some(InstanceDict::new(dict));
+                }
+                Ok(())
+            }
             (Some(_), PySetterValue::Delete) => {
                 unsafe {
                     let ptr = self as *const _ as *mut PyObject;
                     (*ptr).0.dict = None;
                 }
                 Ok(())
             }
-            (None, PySetterValue::Delete) => Ok(()),
+            (None, PySetterValue::Delete) => Err(PySetterValue::Delete),
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -496,9 +496,13 @@ pub fn object_get_dict(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyDict`
`496`	`496`	`.ok_or_else(\|\| vm.new_attribute_error("This object has no __dict__".to_owned()))`
`497`	`497`	`}`
`498`	`498`
`499`		`-pub fn object_set_dict(obj: PyObjectRef, dict: PySetterValue<PyDictRef>, vm: &VirtualMachine) -> PyResult<()> {`
	`499`	`+pub fn object_set_dict(`
	`500`	`+ obj: PyObjectRef,`
	`501`	`+ dict: PySetterValue<PyDictRef>,`
	`502`	`+ vm: &VirtualMachine,`
	`503`	`+) -> PyResult<()> {`
`500`	`504`	`obj.set_dict(dict)`
`501`		`- .map_err(\|_\| vm.new_attribute_error("This object has no __dict__".to_owned()))`
	`505`	`+ .map_err(\|_\| vm.new_attribute_error("This object has no __dict__ to delete".to_owned()))`
`502`	`506`	`}`
`503`	`507`
`504`	`508`	`pub fn init(ctx: &Context) {`
Original file line number	Diff line number	Diff line change
`@@ -1288,7 +1288,7 @@ fn subtype_set_dict(obj: PyObjectRef, value: PyObjectRef, vm: &VirtualMachine) -`
`1288`	`1288`	`descr_set(&descr, obj, PySetterValue::Assign(value), vm)`
`1289`	`1289`	`}`
`1290`	`1290`	`None => {`
`1291`		`- object::object_set_dict(obj, PySetterValue::Delete, vm)?;`
	`1291`	`+ object::object_set_dict(obj, PySetterValue::Assign(value.try_into_value(vm)?), vm)?;`
`1292`	`1292`	`Ok(())`
`1293`	`1293`	`}`
`1294`	`1294`	`}`
Original file line number	Diff line number	Diff line change
`@@ -712,21 +712,27 @@ impl PyObject {`
`712`	`712`
`713`	`713`	/// Set the dict field. Returns `Err(dict)` if this object does not have a dict field
`714`	`714`	`/// in the first place.`
`715`		`- pub fn set_dict(&self, dict: PySetterValue<PyDictRef>) -> Result<(), PyDictRef> {`
	`715`	`+ pub fn set_dict(&self, dict: PySetterValue<PyDictRef>) -> Result<(), PySetterValue<PyDictRef>> {`
`716`	`716`	`match (self.instance_dict(), dict) {`
`717`	`717`	`(Some(d), PySetterValue::Assign(dict)) => {`
`718`	`718`	`d.set(dict);`
`719`	`719`	`Ok(())`
`720`	`720`	`}`
`721`		`- (None, PySetterValue::Assign(dict)) => Err(dict),`
	`721`	`+ (None, PySetterValue::Assign(dict)) => {`
	`722`	`+ unsafe {`
	`723`	`+ let ptr = self as const _ as mut PyObject;`
	`724`	`+ (*ptr).0.dict = Some(InstanceDict::new(dict));`
	`725`	`+ }`
	`726`	`+ Ok(())`
	`727`	`+ }`
`722`	`728`	`(Some(_), PySetterValue::Delete) => {`
`723`	`729`	`unsafe {`
`724`	`730`	`let ptr = self as const _ as mut PyObject;`
`725`	`731`	`(*ptr).0.dict = None;`
`726`	`732`	`}`
`727`	`733`	`Ok(())`
`728`	`734`	`}`
`729`		`- (None, PySetterValue::Delete) => Ok(()),`
	`735`	`+ (None, PySetterValue::Delete) => Err(PySetterValue::Delete),`
`730`	`736`	`}`
`731`	`737`	`}`
`732`	`738`