Skip to content

Fix del obj.__dict__ to match CPython behavior (fixes #5355) #7568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alok-108 wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Fix del obj.__dict__ to match CPython behavior (fixes #5355) #7568

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f1d9358
Fix del obj.__dict__ to match CPython behavior (issue #5355)
alok-108 Apr 6, 2026
28c5fe2
Address CodeRabbit concerns: fix GC clearing and improve thread safet…
alok-108 Apr 6, 2026
d3cc9d4
Fix del obj.__dict__: improve GC safety, implement lazy re-creation i…
alok-108 Apr 7, 2026
0b085ee
Restore expectedFailure for test_has_inline_values
alok-108 Apr 7, 2026
477c901
Fix ObjExt::new call site to include has_dict parameter
alok-108 Apr 7, 2026
4cc6d83
Remove stray test.py to avoid CI syntax errors
alok-108 Apr 7, 2026
f7f9e28
Remove debug txt files and clean test_class.py comments
alok-108 Apr 7, 2026
6ca9631
Delete Lib/test/test_class.py
alok-108 Apr 7, 2026
2564ed1
Restore test_class.py with correct changes (remove expectedFailure, n…
alok-108 Apr 7, 2026
7651712
Fix clippy warnings: remove unused into_inner, collapse nested if-let
alok-108 Apr 7, 2026
7882153
Fix rustfmt formatting and ruff PEP 8 E302 blank line
alok-108 Apr 8, 2026
143a92c
Align __dict__ error messages and ensure safety for function/partial …
alok-108 Apr 8, 2026
c46e482
Fix compilation errors: change &self to &Py<Self> in __dict__ methods
alok-108 Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address CodeRabbit concerns: fix GC clearing and improve thread safet… 
…y of lazy __dict__ recreation
  • Loading branch information
@alok-108
alok-108 committed Apr 6, 2026
commit 28c5fe2c2b7a57550326a75afcb44614524d6979
6 changes: 1 addition & 5 deletions crates/vm/src/builtins/object.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,11 +558,7 @@ pub fn object_get_dict(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyDict
Ok(dict)
} else {
match obj.instance_dict() {
Some(d) => {
let dict = vm.ctx.new_dict();
d.set(Some(dict.clone()));
Ok(dict)
}
Some(d) => Ok(d.get_or_insert(vm)),
None => Err(vm.new_attribute_error("This object has no __dict__")),
}
}
Expand Down
20 changes: 16 additions & 4 deletions crates/vm/src/object/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,8 +909,8 @@ impl Py<PyWeak> {
}

#[derive(Debug)]
pub(super) struct InstanceDict {
pub(super) d: PyRwLock<Option<PyDictRef>>,
pub(crate) struct InstanceDict {
pub(crate) d: PyRwLock<Option<PyDictRef>>,
}

impl From<PyDictRef> for InstanceDict {
Expand Down Expand Up @@ -948,6 +948,17 @@ impl InstanceDict {
pub fn into_inner(self) -> Option<PyDictRef> {
self.d.into_inner()
}

pub(crate) fn get_or_insert(&self, vm: &VirtualMachine) -> PyDictRef {
let mut d = self.d.write();
if let Some(existing) = d.as_ref() {
existing.clone()
} else {
let dict = vm.ctx.new_dict();
*d = Some(dict.clone());
dict
}
}
}

impl<T: PyPayload> PyInner<T> {
Expand Down Expand Up @@ -1776,8 +1787,9 @@ impl PyObject {
let ext = unsafe { &mut *ext_ptr };
if let Some(old_dict) = ext.dict.take() {
// Get the dict ref before dropping InstanceDict
let dict_ref = old_dict.into_inner();
result.push(dict_ref.into());
if let Some(dict_ref) = old_dict.into_inner() {
result.push(dict_ref.into());
}
}
for slot in ext.slots.iter() {
if let Some(val) = slot.write().take() {
Expand Down
Loading