Remove interpolated string from jsinterop startup

dotnet · Apr 17, 2024 · 6b97da5 · 6b97da5
1 parent a1542b6
commit 6b97da5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/src/libraries/Common/src/Interop/Browser/Interop.Runtime.cs b/src/libraries/Common/src/Interop/Browser/Interop.Runtime.cs
@@ -69,6 +69,6 @@ internal static unsafe partial class Runtime
         [MethodImpl(MethodImplOptions.InternalCall)]
         public static extern void BindAssemblyExports(IntPtr assemblyNamePtr);
         [MethodImpl(MethodImplOptions.InternalCall)]
-        public static extern void GetAssemblyExport(IntPtr assemblyNamePtr, IntPtr namespacePtr, IntPtr classnamePtr, IntPtr methodNamePtr, IntPtr* monoMethodPtrPtr);
+        public static extern void GetAssemblyExport(IntPtr assemblyNamePtr, IntPtr namespacePtr, IntPtr classnamePtr, IntPtr methodNamePtr, int signatureHash, IntPtr* monoMethodPtrPtr);
     }
 }
diff --git a/...Services.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSHostImplementation.cs b/...Services.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSHostImplementation.cs
@@ -282,15 +282,21 @@ public static unsafe Task BindAssemblyExports(string? assemblyName)
         public static unsafe JSFunctionBinding BindManagedFunction(string fullyQualifiedName, int signatureHash, ReadOnlySpan<JSMarshalerType> signatures)
         {
             var (assemblyName, nameSpace, shortClassName, methodName) = ParseFQN(fullyQualifiedName);
-            var wrapper_name = $"__Wrapper_{methodName}_{signatureHash}";
+
             var dllName = assemblyName + ".dll";
 
             IntPtr monoMethod;
             Interop.Runtime.GetAssemblyExport(
+                // FIXME: Pass UTF-16 through directly so C can work with it, doing the conversion
+                //  in C# pulls in a bunch of dependencies we don't need this early in startup.
+                // I tested removing the UTF8 conversion from this specific call, but other parts
+                //  of startup I can't identify still pull in UTF16->UTF8 conversion, so it's not
+                //  worth it to do that yet.
                 Marshal.StringToCoTaskMemUTF8(dllName),
                 Marshal.StringToCoTaskMemUTF8(nameSpace),
                 Marshal.StringToCoTaskMemUTF8(shortClassName),
-                Marshal.StringToCoTaskMemUTF8(wrapper_name),
+                Marshal.StringToCoTaskMemUTF8(methodName),
+                signatureHash,
                 &monoMethod);
 
             if (monoMethod == IntPtr.Zero)
@@ -330,7 +336,7 @@ public static RuntimeMethodHandle GetMethodHandleFromIntPtr(IntPtr ptr)
         // The BCL implementations of IndexOf/LastIndexOf/Trim are vectorized & fast,
         //  but they pull in a bunch of code that is otherwise not necessarily
         //  useful during early app startup, so we use simple scalar implementations
-        static int SmallIndexOf (string s, char ch, int direction = 1) {
+        private static int SmallIndexOf (string s, char ch, int direction = 1) {
             if (s.Length < 1)
                 return -1;
             int start_index = (direction > 0) ? 0 : s.Length - 1,
@@ -342,10 +348,9 @@ static int SmallIndexOf (string s, char ch, int direction = 1) {
             return -1;
         }
 
-        static string SmallTrim (string s) {
+        private static string SmallTrim (string s) {
             if (s.Length < 1)
                 return s;
-            bool done = false;
             int head = 0, tail = s.Length - 1;
             while (head < s.Length) {
                 if (s[head] == ' ')

diff --git a/src/mono/browser/runtime/corebindings.c b/src/mono/browser/runtime/corebindings.c
@@ -34,7 +34,7 @@ typedef void (*background_job_cb)(void);
 
 void mono_wasm_bind_assembly_exports (char *assembly_name);
 void mono_wasm_assembly_get_entry_point (char *assembly_name, int auto_insert_breakpoint, MonoMethod **method_out);
-void mono_wasm_get_assembly_export (char *assembly_name, char *namespace, char *classname, char *methodname, MonoMethod **method_out);
+void mono_wasm_get_assembly_export (char *assembly_name, char *namespace, char *classname, char *methodname, int signature_hash, MonoMethod **method_out);
 
 #ifndef DISABLE_THREADS
 void mono_wasm_release_cs_owned_object_post (pthread_t target_tid, int js_handle);
@@ -230,13 +230,14 @@ void mono_wasm_bind_assembly_exports (char *assembly_name)
 	}
 }
 
-void mono_wasm_get_assembly_export (char *assembly_name, char *namespace, char *classname, char *methodname, MonoMethod **method_out)
+void mono_wasm_get_assembly_export (char *assembly_name, char *namespace, char *classname, char *methodname, int signature_hash, MonoMethod **method_out)
 {
 	MonoError error;
 	MonoAssembly* assembly;
 	MonoImage *image;
 	MonoClass *klass;
 	MonoMethod *method=NULL;
+    char real_method_name_buffer[4096];
 	*method_out = NULL;
 
 	assert (assembly_name);
@@ -247,10 +248,14 @@ void mono_wasm_get_assembly_export (char *assembly_name, char *namespace, char *
 
 	klass = mono_class_from_name (image, namespace, classname);
 	assert (klass);
-	method = mono_class_get_method_from_name (klass, methodname, -1);
+
+    snprintf(real_method_name_buffer, 4096, "__Wrapper_%s_%d", methodname, signature_hash);
+
+	method = mono_class_get_method_from_name (klass, real_method_name_buffer, -1);
 	assert (method);
 
 	*method_out = method;
+    // FIXME: free (assembly_name)?
 	free (namespace);
 	free (classname);
 	free (methodname);