Skip to content

overridable validate_downcastable_from #6393

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 1 commit into from
Dec 10, 2025
Merged

overridable validate_downcastable_from #6393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions crates/vm/src/builtins/builtin_func.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ impl Representable for PyNativeFunction {
impl Unconstructible for PyNativeFunction {}

// `PyCMethodObject` in CPython
#[pyclass(name = "builtin_method", module = false, base = PyNativeFunction)]
#[pyclass(name = "builtin_method", module = false, base = PyNativeFunction, ctx = "builtin_method_type")]
pub struct PyNativeMethod {
pub(crate) func: PyNativeFunction,
pub(crate) class: &'static Py<PyType>, // TODO: the actual life is &'self
Expand Down Expand Up @@ -189,12 +189,6 @@ impl PyNativeMethod {
}
}

impl PyPayload for PyNativeMethod {
fn class(ctx: &Context) -> &'static Py<PyType> {
ctx.types.builtin_method_type
}
}

impl fmt::Debug for PyNativeMethod {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(
Expand Down
10 changes: 4 additions & 6 deletions crates/vm/src/builtins/str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1932,12 +1932,10 @@ impl PyPayload for PyUtf8Str {
std::any::TypeId::of::<PyStr>()
}

fn downcastable_from(obj: &PyObject) -> bool {
obj.typeid() == Self::payload_type_id() && {
// SAFETY: we know the object is a PyStr in this context
let wtf8 = unsafe { obj.downcast_unchecked_ref::<PyStr>() };
wtf8.is_utf8()
}
fn validate_downcastable_from(obj: &PyObject) -> bool {
// SAFETY: we know the object is a PyStr in this context
let wtf8 = unsafe { obj.downcast_unchecked_ref::<PyStr>() };
wtf8.is_utf8()
}

fn try_downcast_from(obj: &PyObject, vm: &VirtualMachine) -> PyResult<()> {
Expand Down
7 changes: 6 additions & 1 deletion crates/vm/src/object/payload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ pub trait PyPayload: MaybeTraverse + PyThreadingConstraint + Sized + 'static {
/// # Safety: this function should only be called if `payload_type_id` matches the type of `obj`.
#[inline]
fn downcastable_from(obj: &PyObject) -> bool {
obj.typeid() == Self::payload_type_id()
obj.typeid() == Self::payload_type_id() && Self::validate_downcastable_from(obj)
}

#[inline]
fn validate_downcastable_from(_obj: &PyObject) -> bool {
true
}

fn try_downcast_from(obj: &PyObject, vm: &VirtualMachine) -> PyResult<()> {
Expand Down
Loading