Move typeid into vtable

coolreader18 · coolreader18 · commit 7249af9a2604 · 2025-10-31T13:22:33.000-05:00
diff --git a/vm/src/builtins/str.rs b/vm/src/builtins/str.rs
@@ -1959,12 +1959,10 @@ impl PyPayload for PyUtf8Str {
         ctx.types.str_type
     }
 
-    fn payload_type_id() -> std::any::TypeId {
-        std::any::TypeId::of::<PyStr>()
-    }
+    const PAYLOAD_TYPE_ID: std::any::TypeId = std::any::TypeId::of::<PyStr>();
 
     fn downcastable_from(obj: &PyObject) -> bool {
-        obj.typeid() == Self::payload_type_id() && {
+        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()
diff --git a/vm/src/object/core.rs b/vm/src/object/core.rs
@@ -103,8 +103,6 @@ pub(super) unsafe fn try_trace_obj<T: PyObjectPayload>(
 #[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
@@ -446,7 +444,6 @@ impl<T: PyObjectPayload> 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),
@@ -639,7 +636,7 @@ impl PyObject {
     #[deprecated(note = "use downcastable instead")]
     #[inline(always)]
     pub fn payload_is<T: PyObjectPayload>(&self) -> bool {
-        self.0.typeid == T::payload_type_id()
+        self.0.vtable.typeid == T::PAYLOAD_TYPE_ID
     }
 
     /// Force to return payload as T.
@@ -725,7 +722,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.
@@ -1229,7 +1226,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(),
@@ -1241,7 +1237,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/vm/src/object/payload.rs b/vm/src/object/payload.rs
@@ -19,15 +19,12 @@ cfg_if::cfg_if! {
 pub trait PyPayload:
     std::fmt::Debug + MaybeTraverse + PyThreadingConstraint + Sized + 'static
 {
-    #[inline]
-    fn payload_type_id() -> std::any::TypeId {
-        std::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()
+        obj.typeid() == Self::PAYLOAD_TYPE_ID
     }
 
     fn try_downcast_from(obj: &PyObject, vm: &VirtualMachine) -> PyResult<()> {
diff --git a/vm/src/object/traverse_object.rs b/vm/src/object/traverse_object.rs
@@ -1,3 +1,4 @@
+use std::any::TypeId;
 use std::fmt;
 
 use crate::{
@@ -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 {
