Move typeid into vtable

coolreader18 · youknowone · commit ef416be2216f · 2025-12-30T17:20:07.000+09:00
diff --git a/crates/vm/src/builtins/str.rs b/crates/vm/src/builtins/str.rs
@@ -1946,9 +1946,7 @@ impl PyPayload for PyUtf8Str {
         ctx.types.str_type
     }
 
-    fn payload_type_id() -> core::any::TypeId {
-        core::any::TypeId::of::<PyStr>()
-    }
+    const PAYLOAD_TYPE_ID: std::any::TypeId = std::any::TypeId::of::<PyStr>();
 
     fn validate_downcastable_from(obj: &PyObject) -> bool {
         // SAFETY: we know the object is a PyStr in this context
diff --git a/crates/vm/src/object/core.rs b/crates/vm/src/object/core.rs
@@ -15,7 +15,6 @@ use super::{
     ext::{AsObject, PyRefExact, PyResult},
     payload::PyPayload,
 };
-use crate::object::traverse_object::PyObjVTable;
 use crate::{
     builtins::{PyDictRef, PyType, PyTypeRef},
     common::{
@@ -24,6 +23,7 @@ use crate::{
         lock::{PyMutex, PyMutexGuard, PyRwLock},
         refcount::RefCount,
     },
+    object::{PyObjectPayload, traverse_object::PyObjVTable},
     vm::VirtualMachine,
 };
 use crate::{
@@ -105,8 +105,6 @@ pub(super) unsafe fn try_trace_obj<T: PyPayload>(x: &PyObject, tracer_fn: &mut T
 #[repr(C)]
 pub(super) struct PyInner<T> {
     pub(super) ref_count: RefCount,
-    // TODO: move typeid into vtable once TypeId::of is const
-    pub(super) typeid: TypeId,
     pub(super) vtable: &'static PyObjVTable,
 
     pub(super) typ: PyAtomicRef<PyType>, // __class__ member
@@ -449,7 +447,6 @@ impl<T: PyPayload + core::fmt::Debug> PyInner<T> {
         let member_count = typ.slots.member_count;
         Box::new(Self {
             ref_count: RefCount::new(),
-            typeid: T::payload_type_id(),
             vtable: PyObjVTable::of::<T>(),
             typ: PyAtomicRef::from(typ),
             dict: dict.map(InstanceDict::new),
@@ -638,8 +635,8 @@ impl PyObject {
 
     #[deprecated(note = "use downcastable instead")]
     #[inline(always)]
-    pub fn payload_is<T: PyPayload>(&self) -> bool {
-        self.0.typeid == T::payload_type_id()
+    pub fn payload_is<T: PyObjectPayload>(&self) -> bool {
+        self.0.vtable.typeid == T::PAYLOAD_TYPE_ID
     }
 
     /// Force to return payload as T.
@@ -657,7 +654,7 @@ impl PyObject {
 
     #[deprecated(note = "use downcast_ref instead")]
     #[inline(always)]
-    pub fn payload<T: PyPayload>(&self) -> Option<&T> {
+    pub fn payload<T: PyPayload + std::fmt::Debug>(&self) -> Option<&T> {
         #[allow(deprecated)]
         if self.payload_is::<T>() {
             #[allow(deprecated)]
@@ -678,7 +675,10 @@ impl PyObject {
 
     #[deprecated(note = "use downcast_ref_if_exact instead")]
     #[inline(always)]
-    pub fn payload_if_exact<T: PyPayload>(&self, vm: &VirtualMachine) -> Option<&T> {
+    pub fn payload_if_exact<T: PyPayload + std::fmt::Debug>(
+        &self,
+        vm: &VirtualMachine,
+    ) -> Option<&T> {
         if self.class().is(T::class(&vm.ctx)) {
             #[allow(deprecated)]
             self.payload()
@@ -711,7 +711,10 @@ impl PyObject {
 
     #[deprecated(note = "use downcast_ref instead")]
     #[inline(always)]
-    pub fn payload_if_subclass<T: crate::PyPayload>(&self, vm: &VirtualMachine) -> Option<&T> {
+    pub fn payload_if_subclass<T: crate::PyPayload + std::fmt::Debug>(
+        &self,
+        vm: &VirtualMachine,
+    ) -> Option<&T> {
         if self.class().fast_issubclass(T::class(&vm.ctx)) {
             #[allow(deprecated)]
             self.payload()
@@ -722,7 +725,7 @@ impl PyObject {
 
     #[inline]
     pub(crate) fn typeid(&self) -> TypeId {
-        self.0.typeid
+        self.0.vtable.typeid
     }
 
     /// Check if this object can be downcast to T.
@@ -1276,7 +1279,6 @@ pub(crate) fn init_type_hierarchy() -> (PyTypeRef, PyTypeRef, PyTypeRef) {
         let type_type_ptr = Box::into_raw(Box::new(partially_init!(
             PyInner::<PyType> {
                 ref_count: RefCount::new(),
-                typeid: TypeId::of::<PyType>(),
                 vtable: PyObjVTable::of::<PyType>(),
                 dict: None,
                 weak_list: WeakRefList::new(),
@@ -1288,7 +1290,6 @@ pub(crate) fn init_type_hierarchy() -> (PyTypeRef, PyTypeRef, PyTypeRef) {
         let object_type_ptr = Box::into_raw(Box::new(partially_init!(
             PyInner::<PyType> {
                 ref_count: RefCount::new(),
-                typeid: TypeId::of::<PyType>(),
                 vtable: PyObjVTable::of::<PyType>(),
                 dict: None,
                 weak_list: WeakRefList::new(),
diff --git a/crates/vm/src/object/payload.rs b/crates/vm/src/object/payload.rs
@@ -30,11 +30,12 @@ pub trait PyPayload: MaybeTraverse + PyThreadingConstraint + Sized + 'static {
     fn payload_type_id() -> core::any::TypeId {
         core::any::TypeId::of::<Self>()
     }
+    const PAYLOAD_TYPE_ID: std::any::TypeId = std::any::TypeId::of::<Self>();
 
     /// # 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() && Self::validate_downcastable_from(obj)
+        obj.typeid() == Self::PAYLOAD_TYPE_ID && Self::validate_downcastable_from(obj)
     }
 
     #[inline]
diff --git a/crates/vm/src/object/traverse_object.rs b/crates/vm/src/object/traverse_object.rs
@@ -1,4 +1,5 @@
 use alloc::fmt;
+use std::any::TypeId;
 
 use crate::{
     PyObject,
@@ -11,6 +12,7 @@ use crate::{
 use super::{Traverse, TraverseFn};
 
 pub(in crate::object) struct PyObjVTable {
+    pub(in crate::object) typeid: TypeId,
     pub(in crate::object) drop_dealloc: unsafe fn(*mut PyObject),
     pub(in crate::object) debug: unsafe fn(&PyObject, &mut fmt::Formatter<'_>) -> fmt::Result,
     pub(in crate::object) trace: Option<unsafe fn(&PyObject, &mut TraverseFn<'_>)>,
@@ -19,6 +21,7 @@ pub(in crate::object) struct PyObjVTable {
 impl PyObjVTable {
     pub const fn of<T: PyObjectPayload>() -> &'static Self {
         &Self {
+            typeid: T::PAYLOAD_TYPE_ID,
             drop_dealloc: drop_dealloc_obj::<T>,
             debug: debug_obj::<T>,
             trace: const {

Original file line number	Diff line number	Diff line change
`@@ -1946,9 +1946,7 @@ impl PyPayload for PyUtf8Str {`
`1946`	`1946`	`ctx.types.str_type`
`1947`	`1947`	`}`
`1948`	`1948`
`1949`		`- fn payload_type_id() -> core::any::TypeId {`
`1950`		`- core::any::TypeId::of::<PyStr>()`
`1951`		`- }`
	`1949`	`+ const PAYLOAD_TYPE_ID: std::any::TypeId = std::any::TypeId::of::<PyStr>();`
`1952`	`1950`
`1953`	`1951`	`fn validate_downcastable_from(obj: &PyObject) -> bool {`
`1954`	`1952`	`// SAFETY: we know the object is a PyStr in this context`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,12 @@ pub trait PyPayload: MaybeTraverse + PyThreadingConstraint + Sized + 'static {`
`30`	`30`	`fn payload_type_id() -> core::any::TypeId {`
`31`	`31`	`core::any::TypeId::of::<Self>()`
`32`	`32`	`}`
	`33`	`+ const PAYLOAD_TYPE_ID: std::any::TypeId = std::any::TypeId::of::<Self>();`
`33`	`34`
`34`	`35`	/// # Safety: this function should only be called if `payload_type_id` matches the type of `obj`.
`35`	`36`	`#[inline]`
`36`	`37`	`fn downcastable_from(obj: &PyObject) -> bool {`
`37`		`- obj.typeid() == Self::payload_type_id() && Self::validate_downcastable_from(obj)`
	`38`	`+ obj.typeid() == Self::PAYLOAD_TYPE_ID && Self::validate_downcastable_from(obj)`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`#[inline]`