perf: dynamically dispatch context function in WebIDLConverter (#1035)

Avoids re-instantiating the converters with different generic arguments, saving on binary size.
denoland · Jan 8, 2025 · 2741f28 · 2741f28
1 parent 6e4d533
commit 2741f28
Show file tree

Hide file tree

Showing 8 changed files with 228 additions and 211 deletions.
diff --git a/core/webidl.rs b/core/webidl.rs
diff --git a/ops/op2/dispatch_slow.rs b/ops/op2/dispatch_slow.rs
@@ -711,7 +711,7 @@ pub fn from_arg(
           &mut #scope,
           #arg_ident,
           #prefix.into(),
-          || std::borrow::Cow::Borrowed(#context),
+          deno_core::webidl::ContextFn::new_borrowed(&|| std::borrow::Cow::Borrowed(#context)),
           &#options,
         ) {
           Ok(t) => t,

diff --git a/ops/op2/test_cases/sync/webidl.out b/ops/op2/test_cases/sync/webidl.out
diff --git a/ops/webidl/dictionary.rs b/ops/webidl/dictionary.rs
@@ -119,7 +119,7 @@ pub fn get_body(
       quote! {
         return Err(::deno_core::webidl::WebIdlError::new(
           __prefix,
-          &__context,
+          __context.borrowed(),
           ::deno_core::webidl::WebIdlErrorKind::DictionaryCannotConvertKey {
             converter: #ident_string,
             key: #string_name,
@@ -139,7 +139,7 @@ pub fn get_body(
             } else {
               let __key = #v8_static_name
                 .v8_string(__scope)
-                .map_err(|e| ::deno_core::webidl::WebIdlError::other(__prefix.clone(), &__context, e))?;
+                .map_err(|e| ::deno_core::webidl::WebIdlError::other(__prefix.clone(), __context.borrowed(), e))?;
               __eternal.set(__scope, __key);
               Ok(__key)
             }
@@ -151,7 +151,7 @@ pub fn get_body(
             __scope,
             __value,
             __prefix.clone(),
-            || format!("{} ({})", #new_context, __context()).into(),
+            ::deno_core::webidl::ContextFn::new_borrowed(&|| format!("{} ({})", #new_context, __context.call()).into()),
             &#options,
           )?
         } else {
@@ -178,7 +178,7 @@ pub fn get_body(
       } else {
         return Err(::deno_core::webidl::WebIdlError::new(
           __prefix,
-          &__context,
+          __context.borrowed(),
           ::deno_core::webidl::WebIdlErrorKind::ConvertToConverterType("dictionary")
         ));
       }

diff --git a/ops/webidl/enum.rs b/ops/webidl/enum.rs
@@ -33,14 +33,14 @@ pub fn get_body(
     let Ok(str) = __value.try_cast::<::deno_core::v8::String>() else {
       return Err(::deno_core::webidl::WebIdlError::new(
         __prefix,
-        &__context,
+        __context,
         ::deno_core::webidl::WebIdlErrorKind::ConvertToConverterType("enum"),
       ));
     };
 
     match str.to_rust_string_lossy(__scope).as_str() {
       #(#variants),*,
-      s => Err(::deno_core::webidl::WebIdlError::new(__prefix, &__context, ::deno_core::webidl::WebIdlErrorKind::InvalidEnumVariant { converter: #ident_string, variant: s.to_string() }))
+      s => Err(::deno_core::webidl::WebIdlError::new(__prefix, __context, ::deno_core::webidl::WebIdlErrorKind::InvalidEnumVariant { converter: #ident_string, variant: s.to_string() }))
     }
   })
 }

diff --git a/ops/webidl/mod.rs b/ops/webidl/mod.rs
@@ -98,15 +98,13 @@ fn create_impl(ident: Ident, body: TokenStream) -> TokenStream {
     impl<'a> ::deno_core::webidl::WebIdlConverter<'a> for #ident {
       type Options = ();
 
-      fn convert<C>(
+      fn convert<'b>(
         __scope: &mut ::deno_core::v8::HandleScope<'a>,
         __value: ::deno_core::v8::Local<'a, ::deno_core::v8::Value>,
         __prefix: std::borrow::Cow<'static, str>,
-        __context: C,
+        __context: ::deno_core::webidl::ContextFn<'b>,
         __options: &Self::Options,
       ) -> Result<Self, ::deno_core::webidl::WebIdlError>
-      where
-        C: Fn() -> std::borrow::Cow<'static, str>,
       {
         #body
       }

diff --git a/ops/webidl/test_cases/dict.out b/ops/webidl/test_cases/dict.out
diff --git a/ops/webidl/test_cases/enum.out b/ops/webidl/test_cases/enum.out