FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Revert class lookup by youknowone · Pull Request #7306 · RustPython/RustPython · GitHub

/ RustPython Public

Revert class lookup #7306

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 2 commits into from
Mar 2, 2026
Conversation 1 Commits 2 Checks 12 Files changed
Merged

Revert class lookup #7306

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
863fd73
Revert __class__ lookup skip in object_isinstance
youknowone Mar 1, 2026
864bf57
Collapse nested if in object_isinstance for clippy
youknowone Mar 2, 2026
File filter

Filter by extension

Filter by extension .rs  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
46 changes: 15 additions & 31 deletions crates/vm/src/protocol/object.rs
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
use crate::{
AsObject, Py, PyObject, PyObjectRef, PyRef, PyResult, TryFromObject, VirtualMachine,
builtins::{
PyBaseObject, PyBytes, PyDict, PyDictRef, PyGenericAlias, PyInt, PyList, PyStr, PyTuple,
PyTupleRef, PyType, PyTypeRef, PyUtf8Str, pystr::AsPyStr,
PyBytes, PyDict, PyDictRef, PyGenericAlias, PyInt, PyList, PyStr, PyTuple, PyTupleRef,
PyType, PyTypeRef, PyUtf8Str, pystr::AsPyStr,
},
common::{hash::PyHash, str::to_ascii},
convert::{ToPyObject, ToPyResult},
Expand Down Expand Up @@ -580,18 +580,13 @@ impl PyObject {
if let Ok(cls) = cls.try_to_ref::<PyType>(vm) {
// PyType_Check(cls) - cls is a type object
let mut retval = self.class().is_subtype(cls);
if !retval {
// __class__ is a data descriptor on object that always returns
// obj.class() under standard __getattribute__. Only do the
// expensive attribute lookup when getattro is overridden.
if !self.has_standard_getattro()
&& let Some(i_cls) =
vm.get_attribute_opt(self.to_owned(), identifier!(vm, __class__))?
&& let Ok(i_cls_type) = PyTypeRef::try_from_object(vm, i_cls)
&& !i_cls_type.is(self.class())
{
retval = i_cls_type.is_subtype(cls);
}
if !retval
&& let Some(i_cls) =
vm.get_attribute_opt(self.to_owned(), identifier!(vm, __class__))?
&& let Ok(i_cls_type) = PyTypeRef::try_from_object(vm, i_cls)
&& !i_cls_type.is(self.class())
{
retval = i_cls_type.is_subtype(cls);
}
Ok(retval)
} else {
Expand All @@ -603,15 +598,13 @@ impl PyObject {
)
})?;

let i_cls: PyObjectRef = if self.has_standard_getattro() {
self.class().to_owned().into()
if let Some(i_cls) =
vm.get_attribute_opt(self.to_owned(), identifier!(vm, __class__))?
{
i_cls.abstract_issubclass(cls, vm)
} else {
match vm.get_attribute_opt(self.to_owned(), identifier!(vm, __class__))? {
Some(cls) => cls,
None => return Ok(false),
}
};
i_cls.abstract_issubclass(cls, vm)
Ok(false)
}
}
}

Expand Down Expand Up @@ -789,15 +782,6 @@ impl PyObject {
Err(vm.new_type_error(format!("'{}' does not support item deletion", self.class())))
}

/// Returns true if the object uses the standard `__getattribute__`
/// (i.e. `object.__getattribute__`), meaning attribute access follows
/// the normal descriptor protocol without custom interception.
#[inline]
fn has_standard_getattro(&self) -> bool {
let getattro = self.class().slots.getattro.load().unwrap();
getattro as usize == PyBaseObject::getattro as *const () as usize
}

/// Equivalent to CPython's _PyObject_LookupSpecial
/// Looks up a special method in the type's MRO without checking instance dict.
/// Returns None if not found (masking AttributeError like CPython).
Expand Down
Loading
Back | FazBrowse Home | New Git URL