[mono][wasm] Fix function signature mismatch in m2n invoke

src/mono/browser/runtime/runtime.c

@@ -188,6 +188,33 @@ init_icall_table (void)
 #endif
 }
 
+// Keep synced with FixupSymbolName from src/tasks/Common/Utils.cs
+static void fixupSymbolName(char *key, char *fixedName) {
+    int sb_index = 0;
+	int len = strlen (key);
+
+    for (int i = 0; i < len; ++i) {
+        unsigned char b = key[i];
+        if ((b >= '0' && b <= '9') ||
+            (b >= 'a' && b <= 'z') ||
+            (b >= 'A' && b <= 'Z') ||
+            (b == '_')) {
+            fixedName[sb_index++] = b;
+        }
+        else if (b == '.' || b == '-' || b ==  '+' || b == '<' || b == '>') {
+            fixedName[sb_index++] = '_';
+        }
+		else {
+			// Append the hexadecimal representation of b between underscores
+			sprintf(&fixedName[sb_index], "_%X_", b);
+			sb_index += 4; // Move the index after the appended hexadecimal characters
+        }
+    }
+
+    // Null-terminate the fixedName string
+    fixedName[sb_index] = '\0';
+}
+
 /*
  * get_native_to_interp:
  *
@@ -209,17 +236,13 @@ get_native_to_interp (MonoMethod *method, void *extra_arg)
 	const char *class_name = mono_class_get_name (klass);
 	const char *method_name = mono_method_get_name (method);
 	char key [128];
+	char fixedName[256];
 	int len;
 
 	assert (strlen (name) < 100);
 	snprintf (key, sizeof(key), "%s_%s_%s", name, class_name, method_name);
-	len = strlen (key);
-	for (int i = 0; i < len; ++i) {
-		if (key [i] == '.')
-			key [i] = '_';
-	}
-
-	addr = wasm_dl_get_native_to_interp (key, extra_arg);
+	fixupSymbolName(key, fixedName);
+	addr = wasm_dl_get_native_to_interp (fixedName, extra_arg);
 	MONO_EXIT_GC_UNSAFE;
 	return addr;
 }

src/mono/wasm/Wasm.Build.Tests/Common/TestUtils.cs

@@ -91,7 +91,9 @@ public static void AssertEqual(object expected, object actual, string label)
             $"[{label}]\n");
     }
 
-    private static readonly char[] s_charsToReplace = new[] { '.', '-', '+' };
+    private static readonly char[] s_charsToReplace = new[] { '.', '-', '+', '<', '>' };
+    // Keep synced with FixupSymbolName from src/tasks/Common/Utils.cs
+    // and src/mono/browser/runtime/runtime.c
     public static string FixupSymbolName(string name)
     {
         UTF8Encoding utf8 = new();

src/mono/wasm/Wasm.Build.Tests/PInvokeTableGeneratorTests.cs

@@ -884,5 +884,31 @@ public void EnsureWasmAbiRulesAreFollowedInAOT(BuildArgs buildArgs, RunHost host
         [BuildAndRun(host: RunHost.Chrome, aot: false)]
         public void EnsureWasmAbiRulesAreFollowedInInterpreter(BuildArgs buildArgs, RunHost host, string id) =>
             EnsureWasmAbiRulesAreFollowed(buildArgs, host, id);
+
+        [Theory]
+        [BuildAndRun(host: RunHost.Chrome, aot: false)]
+        public void UCOWithSpecialCharacters(BuildArgs buildArgs, RunHost host, string id)
+        {
+            var extraProperties = "<AllowUnsafeBlocks>true</AllowUnsafeBlocks>";
+            var extraItems = @"<NativeFileReference Include=""local.c"" />";
+
+            buildArgs = ExpandBuildArgs(buildArgs,
+                                        extraItems: extraItems,
+                                        extraProperties: extraProperties);
+
+            (string libraryDir, string output) = BuildProject(buildArgs,
+                                        id: id,
+                                        new BuildProjectOptions(
+                                            InitProject: () =>
+                                            {
+                                                File.Copy(Path.Combine(BuildEnvironment.TestAssetsPath, "Wasm.Buid.Tests.Programs", "UnmanagedCallback.cs"), Path.Combine(_projectDir!, "Program.cs"));
+                                                File.Copy(Path.Combine(BuildEnvironment.TestAssetsPath, "native-libs", "local.c"), Path.Combine(_projectDir!, "local.c"));
+                                            },
+                                            Publish: true,
+                                            DotnetWasmFromRuntimePack: false));
+
+            var runOutput = RunAndTestWasmApp(buildArgs, buildDir: _projectDir, expectedExitCode: 42, host: host, id: id);
+            Assert.Contains("ManagedFunc returned 42", runOutput);
+        }
     }
 }

src/mono/wasm/testassets/Wasm.Buid.Tests.Programs/UnmanagedCallback.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Runtime.InteropServices;
+
+public unsafe partial class Test
+{
+    public unsafe static int Main(string[] args)
+    {
+        ((IntPtr)(delegate* unmanaged<int,int>)&Interop.Managed8\u4F60Func).ToString();
+
+        Console.WriteLine($"main: {args.Length}");
+        Interop.UnmanagedFunc();
+        return 42;
+    }
+}
+
+file partial class Interop
+{
+    [UnmanagedCallersOnly(EntryPoint = "ManagedFunc")]
+    public static int Managed8\u4F60Func(int number)
+    {
+        // called from UnmanagedFunc
+        Console.WriteLine($"Managed8\u4F60Func({number}) -> 42");
+        return 42;
+    }
+
+    [DllImport("local", EntryPoint = "UnmanagedFunc")]
+    public static extern void UnmanagedFunc(); // calls ManagedFunc
+}

src/mono/wasm/testassets/native-libs/local.c

@@ -0,0 +1,10 @@
+#include <stdio.h>
+int ManagedFunc(int number);
+
+void UnmanagedFunc()
+{
+    int ret = 0;
+    printf("UnmanagedFunc calling ManagedFunc\n");
+    ret = ManagedFunc(123);
+    printf("ManagedFunc returned %d\n", ret);
+}

src/tasks/AotCompilerTask/MonoAOTCompiler.cs

@@ -1237,26 +1237,7 @@ private string FixupSymbolName(string name)
         if (_symbolNameFixups.TryGetValue(name, out string? fixedName))
             return fixedName;
 
-        UTF8Encoding utf8 = new();
-        byte[] bytes = utf8.GetBytes(name);
-        StringBuilder sb = new();
-
-        foreach (byte b in bytes)
-        {
-            if ((b >= (byte)'0' && b <= (byte)'9') ||
-                (b >= (byte)'a' && b <= (byte)'z') ||
-                (b >= (byte)'A' && b <= (byte)'Z') ||
-                (b == (byte)'_'))
-            {
-                sb.Append((char)b);
-            }
-            else
-            {
-                sb.Append('_');
-            }
-        }
-
-        fixedName = sb.ToString();
+        fixedName = Utils.FixupSymbolName(name);
         _symbolNameFixups[name] = fixedName;
         return fixedName;
     }

src/tasks/Common/Utils.cs

@@ -11,6 +11,7 @@
 using System.Reflection.Metadata;
 using System.Security.Cryptography;
 using System.Text;
+using System.Linq;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
@@ -33,6 +34,8 @@ public enum HashEncodingType
 
     private static readonly object s_SyncObj = new object();
 
+    private static readonly char[] s_charsToReplace = new[] { '.', '-', '+', '<', '>' };
+
     public static string GetEmbeddedResource(string file)
     {
         using Stream stream = typeof(Utils).Assembly
@@ -411,4 +414,33 @@ private static bool IsManagedAssembly(PEReader peReader)
             return false;
         }
     }
+
+    // Keep synced with fixupSymbolName from src/mono/browser/runtime/runtime.c
+    public static string FixupSymbolName(string name)
+    {
+        UTF8Encoding utf8 = new();
+        byte[] bytes = utf8.GetBytes(name);
+        StringBuilder sb = new();
+
+        foreach (byte b in bytes)
+        {
+            if ((b >= (byte)'0' && b <= (byte)'9') ||
+                (b >= (byte)'a' && b <= (byte)'z') ||
+                (b >= (byte)'A' && b <= (byte)'Z') ||
+                (b == (byte)'_'))
+            {
+                sb.Append((char)b);
+            }
+            else if (s_charsToReplace.Contains((char)b))
+            {
+                sb.Append('_');
+            }
+            else
+            {
+                sb.Append($"_{b:X}_");
+            }
+        }
+
+        return sb.ToString();
+    }
 }

src/tasks/WasmAppBuilder/ManagedToNativeGenerator.cs

@@ -36,8 +36,6 @@ public class ManagedToNativeGenerator : Task
     [Output]
     public string[]? FileWrites { get; private set; }
 
-    private static readonly char[] s_charsToReplace = new[] { '.', '-', '+', '<', '>' };
-
     public override bool Execute()
     {
         if (Assemblies!.Length == 0)
@@ -108,30 +106,7 @@ string FixupSymbolName(string name)
             if (_symbolNameFixups.TryGetValue(name, out string? fixedName))
                 return fixedName;
 
-            UTF8Encoding utf8 = new();
-            byte[] bytes = utf8.GetBytes(name);
-            StringBuilder sb = new();
-
-            foreach (byte b in bytes)
-            {
-                if ((b >= (byte)'0' && b <= (byte)'9') ||
-                    (b >= (byte)'a' && b <= (byte)'z') ||
-                    (b >= (byte)'A' && b <= (byte)'Z') ||
-                    (b == (byte)'_'))
-                {
-                    sb.Append((char)b);
-                }
-                else if (s_charsToReplace.Contains((char)b))
-                {
-                    sb.Append('_');
-                }
-                else
-                {
-                    sb.Append($"_{b:X}_");
-                }
-            }
-
-            fixedName = sb.ToString();
+            fixedName = Utils.FixupSymbolName(name);
             _symbolNameFixups[name] = fixedName;
             return fixedName;
         }

src/tasks/WasmAppBuilder/PInvokeTableGenerator.cs

@@ -304,7 +304,7 @@ private string DelegateKey(PInvokeCallback export)
         // it needs to match the key generated in get_native_to_interp
         var method = export.Method;
         string module_symbol = method.DeclaringType!.Module!.Assembly!.GetName()!.Name!;
-        return $"\"{module_symbol}_{method.DeclaringType.Name}_{method.Name}\"".Replace('.', '_');
+        return $"\"{_fixupSymbolName($"{module_symbol}_{method.DeclaringType.Name}_{method.Name}")}\"";
     }
 
 #pragma warning disable SYSLIB1045 // framework doesn't support GeneratedRegexAttribute