Merge branch 'main' into upgrade

Author: bartlomieju

Cargo.lock

@@ -21,14 +21,14 @@ repository = "https://github.com/denoland/deno_core"
 [workspace.dependencies]
 # Local dependencies
 deno_ast = { version = "=0.49.0", features = ["transpiling"] }
-deno_core = { version = "0.355.0", path = "./core" }
+deno_core = { version = "0.356.0", path = "./core" }
 deno_core_icudata = "0.74.0"
 deno_core_testing = { path = "./testing" }
 deno_error = { version = "0.7.0", features = ["serde_json", "serde", "url", "tokio"] }
-deno_ops = { version = "0.231.0", path = "./ops" }
+deno_ops = { version = "0.232.0", path = "./ops" }
 deno_unsync = "0.4.2"
-serde_v8 = { version = "0.264.0", path = "./serde_v8" }
-v8 = { path = "../rusty_v8" } #version = "137.3.0", default-features = false }
+serde_v8 = { version = "0.265.0", path = "./serde_v8" }
+v8 = { path = "../rusty_v8" } # version = "137.3.0", default-features = false }
 
 anyhow = "1"
 bencher = "0.1"

Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "deno_core"
-version = "0.355.0"
+version = "0.356.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

core/Cargo.toml

@@ -352,7 +352,7 @@ pub fn wrap_object3<
 }
 
 pub struct UnsafePtr<T: GarbageCollected> {
-  inner: v8::cppgc::UnsafePtr<CppGcObject<T>>,
+  inner: v8::cppgc::Ptr<CppGcObject<T>>,
   root: Option<v8::cppgc::Persistent<CppGcObject<T>>>,
 }
 
@@ -374,6 +374,13 @@ impl<T: GarbageCollected> UnsafePtr<T> {
   }
 }
 
+impl<T: GarbageCollected> std::ops::Deref for UnsafePtr<T> {
+  type Target = T;
+  fn deref(&self) -> &T {
+    &self.inner.member
+  }
+}
+
 #[doc(hidden)]
 #[allow(clippy::needless_lifetimes)]
 pub fn try_unwrap_cppgc_object<'sc, T: GarbageCollected + 'static>(
@@ -401,6 +408,51 @@ pub fn try_unwrap_cppgc_object<'sc, T: GarbageCollected + 'static>(
   })
 }
 
+pub struct Ref<T: GarbageCollected> {
+  inner: v8::cppgc::Persistent<CppGcObject<T>>,
+}
+
+impl<T: GarbageCollected> std::ops::Deref for Ref<T> {
+  type Target = T;
+  fn deref(&self) -> &T {
+    &self.inner.borrow().unwrap().member
+  }
+}
+
+#[doc(hidden)]
+#[allow(clippy::needless_lifetimes)]
+pub fn try_unwrap_cppgc_persistent_object<
+  'sc,
+  T: GarbageCollected + 'static,
+>(
+  isolate: &mut v8::Isolate,
+  val: v8::Local<'sc, v8::Value>,
+) -> Option<Ref<T>> {
+  let ptr = try_unwrap_cppgc_object::<T>(isolate, val)?;
+  Some(Ref {
+    inner: v8::cppgc::Persistent::new(&ptr.inner),
+  })
+}
+
+pub struct Member<T: GarbageCollected> {
+  inner: v8::cppgc::Member<CppGcObject<T>>,
+}
+
+impl<T: GarbageCollected> From<Ref<T>> for Member<T> {
+  fn from(value: Ref<T>) -> Self {
+    Member {
+      inner: v8::cppgc::Member::new(&value.inner),
+    }
+  }
+}
+
+impl<T: GarbageCollected> std::ops::Deref for Member<T> {
+  type Target = T;
+  fn deref(&self) -> &T {
+    &self.inner.borrow().unwrap().member
+  }
+}
+
 #[doc(hidden)]
 #[allow(clippy::needless_lifetimes)]
 pub fn try_unwrap_cppgc_proto_object<
@@ -503,3 +555,55 @@ impl FunctionTemplateData {
       .collect();
   }
 }
+
+#[derive(Debug)]
+pub struct SameObject<T: GarbageCollected + 'static> {
+  cell: std::cell::OnceCell<v8::Global<v8::Object>>,
+  _phantom_data: std::marker::PhantomData<T>,
+}
+
+impl<T: GarbageCollected + 'static> SameObject<T> {
+  #[allow(clippy::new_without_default)]
+  pub fn new() -> Self {
+    Self {
+      cell: Default::default(),
+      _phantom_data: Default::default(),
+    }
+  }
+
+  pub fn get<F>(
+    &self,
+    scope: &mut v8::HandleScope,
+    f: F,
+  ) -> v8::Global<v8::Object>
+  where
+    F: FnOnce(&mut v8::HandleScope) -> T,
+  {
+    self
+      .cell
+      .get_or_init(|| {
+        let v = f(scope);
+        let obj = make_cppgc_object(scope, v);
+        v8::Global::new(scope, obj)
+      })
+      .clone()
+  }
+
+  pub fn set(
+    &self,
+    scope: &mut v8::HandleScope,
+    value: T,
+  ) -> Result<(), v8::Global<v8::Object>> {
+    let obj = make_cppgc_object(scope, value);
+    self.cell.set(v8::Global::new(scope, obj))
+  }
+
+  pub fn try_unwrap(
+    &self,
+    scope: &mut v8::HandleScope,
+  ) -> Option<UnsafePtr<T>> {
+    let obj = self.cell.get()?;
+    let val = v8::Local::new(scope, obj);
+    try_unwrap_cppgc_object(scope, val.cast())
+  }
+}

core/cppgc.rs

@@ -858,7 +858,7 @@ pub trait WebIdlInterfaceConverter:
 }
 
 impl<'a, T: WebIdlInterfaceConverter> WebIdlConverter<'a>
-  for crate::cppgc::UnsafePtr<T>
+  for crate::cppgc::Ref<T>
 {
   type Options = ();
 
@@ -869,8 +869,8 @@ impl<'a, T: WebIdlInterfaceConverter> WebIdlConverter<'a>
     context: ContextFn<'b>,
     _options: &Self::Options,
   ) -> Result<Self, WebIdlError> {
-    match crate::cppgc::try_unwrap_cppgc_object::<T>(scope, value) {
-      Some(ptr) => Ok(ptr),
+    match crate::cppgc::try_unwrap_cppgc_persistent_object::<T>(scope, value) {
+      Some(persistent) => Ok(persistent),
       _ => Err(WebIdlError::new(
         prefix,
         context,

core/webidl.rs

@@ -2,7 +2,7 @@
 
 [package]
 name = "deno_ops"
-version = "0.231.0"
+version = "0.232.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

ops/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "serde_v8"
-version = "0.264.0"
+version = "0.265.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true