Skip to content

More slot impl #6618

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

Merged
youknowone merged 7 commits into from
Jan 1, 2026
Merged

More slot impl #6618

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
135e023
fix update_sub_slot
youknowone Dec 31, 2025
b2a3215
Fix __setitem__ __delitem__ handling
youknowone Dec 31, 2025
59cab45
contains
youknowone Dec 31, 2025
5d24adb
no __bool__ anymore
youknowone Jan 1, 2026
5871c72
Add rops to wrapper
youknowone Jan 1, 2026
9ae607f
Remove pymethod from set
youknowone Jan 1, 2026
bb18d0c
remove len
youknowone Jan 1, 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
Fix __setitem__ __delitem__ handling
  • Loading branch information
@youknowone
youknowone committed Jan 1, 2026
commit b2a321538846155f05aa15ead8e0f10e62646dff
24 changes: 21 additions & 3 deletions crates/vm/src/types/slot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,9 +678,27 @@ impl PyType {
macro_rules! update_sub_slot {
($group:ident, $slot:ident, $wrapper:expr, $variant:ident) => {{
if ADD {
// If this type defines the method itself (not inherited), use wrapper
// to ensure the Python method is called
if self.attributes.read().contains_key(name) {
// Check if this type defines any method that maps to this slot.
// Some slots like SqAssItem/MpAssSubscript are shared by multiple
// methods (__setitem__ and __delitem__). If any of those methods
// is defined, we must use the wrapper to ensure Python method calls.
let has_own = {
let guard = self.attributes.read();
// Check the current method name
let mut result = guard.contains_key(name);
// For ass_item/ass_subscript slots, also check the paired method
// (__setitem__ and __delitem__ share the same slot)
if !result
&& (stringify!($slot) == "ass_item"
|| stringify!($slot) == "ass_subscript")
{
let setitem = ctx.intern_str("__setitem__");
let delitem = ctx.intern_str("__delitem__");
result = guard.contains_key(setitem) || guard.contains_key(delitem);
}
result
};
if has_own {
self.slots.$group.$slot.store(Some($wrapper));
} else if let Some(func) = self.lookup_slot_in_mro(name, ctx, |sf| {
if let SlotFunc::$variant(f) = sf {
Expand Down