Skip to content

Fix isinstance #5869

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 3 commits into from
Jun 30, 2025
Merged

Fix isinstance #5869

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1acca3
lookup_special
youknowone Jun 29, 2025
c3857ee
Fix abstract_issubclass
youknowone Jun 30, 2025
899abbb
Fix real_is_instance
youknowone Jun 29, 2025
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 abstract_issubclass
  • Loading branch information
@youknowone
youknowone committed Jun 30, 2025
commit c3857ee571e4c7b59c34104af471112913fe4bdd
58 changes: 27 additions & 31 deletions vm/src/protocol/object.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,43 +410,39 @@ impl PyObject {
}

fn abstract_issubclass(&self, cls: &PyObject, vm: &VirtualMachine) -> PyResult<bool> {
// # Safety: The lifetime of `derived` is forced to be ignored
let bases = unsafe {
let mut derived = self;
// First loop: handle single inheritance without recursion
loop {
if derived.is(cls) {
return Ok(true);
}
// Store the current derived class to check
let mut bases: PyTupleRef;
let mut derived = self;

let Some(bases) = derived.abstract_get_bases(vm)? else {
return Ok(false);
};
let n = bases.len();
match n {
0 => return Ok(false),
1 => {
// Avoid recursion in the single inheritance case
// # safety
// Intention:
// ```
// derived = bases.as_slice()[0].as_object();
// ```
// Though type-system cannot guarantee, derived does live long enough in the loop.
derived = &*(bases.as_slice()[0].as_object() as *const _);
continue;
}
_ => {
// Multiple inheritance - break out to handle recursively
break bases;
}
// First loop: handle single inheritance without recursion
let bases = loop {
if derived.is(cls) {
return Ok(true);
}

let Some(derived_bases) = derived.abstract_get_bases(vm)? else {
return Ok(false);
};

let n = derived_bases.len();
match n {
0 => return Ok(false),
1 => {
// Avoid recursion in the single inheritance case
// Get the next derived class and continue the loop
bases = derived_bases;
derived = &bases.as_slice()[0];
continue;
}
_ => {
// Multiple inheritance - handle recursively
break derived_bases;
}
}
};

// Second loop: handle multiple inheritance with recursion
// At this point we know n >= 2
let n = bases.len();
// At this point we know n >= 2
debug_assert!(n >= 2);

for i in 0..n {
Expand Down