Merge pull request #385 from richarddd/fix/prototype-lookup

Fix/prototype lookup causing prototype missmatch across crates
DelSkayn · Nov 15, 2024 · 2627859 · 2627859
2 parents 71ffb86 + e8dc66e
commit 2627859
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/core/src/allocator/rust.rs b/core/src/allocator/rust.rs
@@ -62,8 +62,7 @@ unsafe impl Allocator for RustAllocator {
         let header = unsafe { &mut *(ptr as *mut Header) };
         header.size = total_size;
 
-        let ptr = unsafe { ptr.add(HEADER_SIZE) };
-        ptr
+        unsafe { ptr.add(HEADER_SIZE) }
     }
 
     fn alloc(&mut self, size: usize) -> *mut u8 {

diff --git a/core/src/class/ffi.rs b/core/src/class/ffi.rs
@@ -76,7 +76,7 @@ pub(crate) type CallFunc = for<'a> unsafe fn(
 pub(crate) type TypeIdFn = fn() -> TypeId;
 
 pub(crate) struct VTable {
-    id: TypeIdFn,
+    id_fn: TypeIdFn,
     finalizer: FinalizerFunc,
     trace: TraceFunc,
     call: CallFunc,
@@ -125,7 +125,7 @@ impl VTable {
 
         impl<'js, C: JsClass<'js>> HasVTable for C {
             const VTABLE: VTable = VTable {
-                id: TypeId::of::<C::Changed<'static>>,
+                id_fn: TypeId::of::<C::Changed<'static>>,
                 finalizer: VTable::finalizer_impl::<'js, C>,
                 trace: VTable::trace_impl::<C>,
                 call: VTable::call_impl::<C>,
@@ -134,8 +134,12 @@ impl VTable {
         &<C as HasVTable>::VTABLE
     }
 
+    pub fn id(&self) -> TypeId {
+        (self.id_fn)()
+    }
+
     pub fn is_of_class<'js, C: JsClass<'js>>(&self) -> bool {
-        (self.id)() == TypeId::of::<C::Changed<'static>>()
+        (self.id_fn)() == TypeId::of::<C::Changed<'static>>()
     }
 }
 

diff --git a/core/src/runtime/opaque.rs b/core/src/runtime/opaque.rs
@@ -8,7 +8,7 @@ use super::{
     InterruptHandler, UserData, UserDataError,
 };
 use std::{
-    any::Any,
+    any::{Any, TypeId},
     cell::{Cell, UnsafeCell},
     collections::{hash_map::Entry, HashMap},
     marker::PhantomData,
@@ -37,7 +37,7 @@ pub(crate) struct Opaque<'js> {
     /// The class id for rust classes which can be called.
     callable_class_id: qjs::JSClassID,
 
-    prototypes: UnsafeCell<HashMap<*const VTable, Option<Object<'js>>>>,
+    prototypes: UnsafeCell<HashMap<TypeId, Option<Object<'js>>>>,
 
     userdata: UserDataMap,
 
@@ -188,7 +188,8 @@ impl<'js> Opaque<'js> {
     ) -> Result<Option<Object<'js>>, Error> {
         unsafe {
             let vtable = VTable::get::<C>();
-            match (*self.prototypes.get()).entry(vtable) {
+            let id = vtable.id();
+            match (*self.prototypes.get()).entry(id) {
                 Entry::Occupied(x) => Ok(x.get().clone()),
                 Entry::Vacant(x) => {
                     let proto = C::prototype(ctx)?;