[browser] fix legacy interop tests

src/libraries/System.Runtime.InteropServices.JavaScript/System.Runtime.InteropServices.JavaScript.sln

@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JSImportGenerator.Unit.Tests", "tests\JSImportGenerator.UnitTest\JSImportGenerator.Unit.Tests.csproj", "{BFED925C-18F2-4C98-833E-66F205234598}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.JavaScript.Legacy.UnitTests", "tests\System.Runtime.InteropServices.JavaScript.Legacy.UnitTests\System.Runtime.InteropServices.JavaScript.Legacy.UnitTests.csproj", "{ABA5A92B-CAD8-47E8-A7CE-D28A67FB69C0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.JavaScript.Legacy.UnitTests", "tests\System.Runtime.InteropServices.JavaScript.Legacy.UnitTests\System.Runtime.InteropServices.JavaScript.Legacy.Tests.csproj", "{ABA5A92B-CAD8-47E8-A7CE-D28A67FB69C0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.JavaScript.Tests", "tests\System.Runtime.InteropServices.JavaScript.UnitTests\System.Runtime.InteropServices.JavaScript.Tests.csproj", "{765B4AA5-723A-44FF-BC4E-EB0F03103F6D}"
 EndProject

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.Legacy.UnitTests/System.Runtime.InteropServices.JavaScript.Legacy.UnitTests.csproj → src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.Legacy.UnitTests/System.Runtime.InteropServices.JavaScript.Legacy.Tests.csproj

@@ -7,6 +7,7 @@
     <NoWarn>0612</NoWarn>
     <WasmEnableLegacyJsInterop Condition="'$(WasmEnableLegacyJsInterop)' == ''">true</WasmEnableLegacyJsInterop>
     <DefineConstants Condition="'$(WasmEnableLegacyJsInterop)' == 'false'">$(DefineConstants);DISABLE_LEGACY_JS_INTEROP</DefineConstants>
+    <Scenario>WasmTestOnBrowser</Scenario>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(WasmEnableLegacyJsInterop)' != 'false'">

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.Legacy.UnitTests/System/Runtime/InteropServices/JavaScript/HelperMarshal.cs

@@ -7,7 +7,7 @@ namespace System.Runtime.InteropServices.JavaScript.Tests
 {
     public static class HelperMarshal
     {
-        internal const string INTEROP_CLASS = "[System.Runtime.InteropServices.JavaScript.Legacy.UnitTests]System.Runtime.InteropServices.JavaScript.Tests.HelperMarshal:";
+        internal const string INTEROP_CLASS = "[System.Runtime.InteropServices.JavaScript.Legacy.Tests]System.Runtime.InteropServices.JavaScript.Tests.HelperMarshal:";
         internal static int _i32Value;
         private static void InvokeI32(int a, int b)
         {

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.Legacy.UnitTests/System/Runtime/InteropServices/JavaScript/MarshalTests.cs

@@ -611,6 +611,20 @@ public static void OnceAJSStringIsInternedItIsAlwaysUsedIfPossible()
             Assert.True(Object.ReferenceEquals(HelperMarshal._stringResource, HelperMarshal._stringResource2));
         }
 
+        [Fact]
+        public static void ManuallyInternString()
+        {
+            HelperMarshal._stringResource = HelperMarshal._stringResource2 = null;
+            Utils.InvokeJS(@"
+                var sym = INTERNAL.stringToMonoStringIntern(""interned string 3"");
+                App.call_test_method (""InvokeString"", [ sym ], ""s"");
+                App.call_test_method (""InvokeString2"", [ sym ], ""s"");
+            ");
+            Assert.Equal("interned string 3", HelperMarshal._stringResource);
+            Assert.Equal(HelperMarshal._stringResource, HelperMarshal._stringResource2);
+            Assert.True(Object.ReferenceEquals(HelperMarshal._stringResource, HelperMarshal._stringResource2));
+        }
+
         [Fact]
         public static void LargeStringsAreNotAutomaticallyLocatedInInternTable()
         {
@@ -619,7 +633,7 @@ public static void LargeStringsAreNotAutomaticallyLocatedInInternTable()
                 var s = ""long interned string"";
                 for (var i = 0; i < 1024; i++)
                     s += String(i % 10);
-                var sym = INTERNAL.mono_intern_string(s);
+                var sym = INTERNAL.stringToMonoStringIntern(s);
                 App.call_test_method (""InvokeString"", [ sym ], ""S"");
                 App.call_test_method (""InvokeString2"", [ sym ], ""s"");
             ");
@@ -633,7 +647,7 @@ public static void CanInternVeryManyStrings()
             HelperMarshal._stringResource = null;
             Utils.InvokeJS(@"
                 for (var i = 0; i < 10240; i++)
-                    INTERNAL.mono_intern_string('s' + i);
+                    INTERNAL.stringToMonoStringIntern('s' + i);
                 App.call_test_method (""InvokeString"", [ 's5000' ], ""S"");
             ");
             Assert.Equal("s5000", HelperMarshal._stringResource);
@@ -658,7 +672,7 @@ public static void SymbolsAreMarshaledAsStrings()
         public static void InternedStringReturnValuesWork()
         {
             HelperMarshal._stringResource = HelperMarshal._stringResource2 = null;
-            var fqn = "[System.Runtime.InteropServices.JavaScript.Legacy.UnitTests]System.Runtime.InteropServices.JavaScript.Tests.HelperMarshal:StoreArgumentAndReturnLiteral";
+            var fqn = "[System.Runtime.InteropServices.JavaScript.Legacy.Tests]System.Runtime.InteropServices.JavaScript.Tests.HelperMarshal:StoreArgumentAndReturnLiteral";
             Utils.InvokeJS(
                 $"var a = BINDING.bind_static_method('{fqn}')('test');\r\n" +
                 $"var b = BINDING.bind_static_method('{fqn}')(a);\r\n" +

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.Legacy.UnitTests/timers.mjs

@@ -7,7 +7,7 @@ export function log(message) {
 }
 
 export function install() {
-    const measuredCallbackName = "mono_wasm_set_timeout_exec";
+    const measuredCallbackName = "mono_wasm_schedule_timer_tick";
     globalThis.registerCount = 0;
     globalThis.hitCount = 0;
     log("install")

src/libraries/tests.proj

@@ -505,7 +505,7 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Formats.Cbor\tests\System.Formats.Cbor.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Linq.Queryable\tests\System.Linq.Queryable.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ObjectModel\tests\System.ObjectModel.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\tests\System.Runtime.InteropServices.JavaScript.Legacy.UnitTests\System.Runtime.InteropServices.JavaScript.Legacy.UnitTests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.InteropServices.JavaScript\tests\System.Runtime.InteropServices.JavaScript.Legacy.UnitTests\System.Runtime.InteropServices.JavaScript.Legacy.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Private.Xml\tests\XmlSerializer\ReflectionOnly\System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime\tests\NlsTests\System.Runtime.Nls.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Serialization.Formatters\tests\System.Runtime.Serialization.Formatters.Tests.csproj" />

src/mono/wasm/runtime/diagnostics/mock/environment.ts

@@ -132,7 +132,7 @@ export function createMockEnvironment(): MockEnvironment {
         postMessageToBrowser,
         addEventListenerFromBrowser,
         createPromiseController,
-        delay: (ms: number) => new Promise(resolve => setTimeout(resolve, ms)),
+        delay: (ms: number) => new Promise(resolve => globalThis.setTimeout(resolve, ms)),
         command,
         reply,
         expectAdvertise

src/mono/wasm/runtime/loader/assets.ts

@@ -195,7 +195,7 @@ export async function mono_download_assets(): Promise<void> {
 }
 
 export function delay(ms: number): Promise<void> {
-    return new Promise(resolve => setTimeout(resolve, ms));
+    return new Promise(resolve => globalThis.setTimeout(resolve, ms));
 }
 
 // FIXME: Connection reset is probably the only good one for which we should retry

src/mono/wasm/runtime/loader/exit.ts

@@ -140,7 +140,7 @@ function logErrorOnExit(exit_code: number, reason?: any) {
                     mono_log_info_no_prefix("WASM EXIT " + exit_code);
                 }
                 else {
-                    setTimeout(stop_when_ws_buffer_empty, 100);
+                    globalThis.setTimeout(stop_when_ws_buffer_empty, 100);
                 }
             };
             stop_when_ws_buffer_empty();

src/mono/wasm/runtime/net6-legacy/exports-legacy.ts

@@ -17,7 +17,7 @@ import { BINDINGType, MONOType } from "./export-types";
 import { mono_wasm_load_data_archive } from "../assets";
 import { mono_method_resolve } from "./method-binding";
 import { runtimeHelpers } from "../globals";
-import { js_string_to_mono_string } from "./strings";
+import { stringToMonoStringIntern, stringToMonoStringUnsafe } from "./strings";
 
 export function export_mono_api(): MONOType {
     return {
@@ -77,6 +77,7 @@ export function cwraps_mono_api(mono: MONOType): void {
 
 export function export_internal_api(): any {
     return {
+        stringToMonoStringIntern, // MarshalTests.cs
         mono_method_resolve, //MarshalTests.cs
     };
 }
@@ -88,7 +89,7 @@ export function export_binding_api(): BINDINGType {
         call_assembly_entry_point: mono_call_assembly_entry_point,
         mono_obj_array_new: <any>null,
         mono_obj_array_set: <any>null,
-        js_string_to_mono_string,
+        js_string_to_mono_string: stringToMonoStringUnsafe,
         js_typed_array_to_array,
         mono_array_to_js_array,
         js_to_mono_obj,

src/mono/wasm/runtime/net6-legacy/strings.ts

@@ -3,13 +3,13 @@
 
 import { assert_legacy_interop } from "../pthreads/shared";
 import { mono_wasm_new_root } from "../roots";
-import { stringToMonoStringRoot } from "../strings";
-import { MonoString } from "../types/internal";
+import { interned_string_table, mono_wasm_empty_string, stringToInternedMonoStringRoot, stringToMonoStringRoot } from "../strings";
+import { MonoString, is_nullish } from "../types/internal";
 
 /**
  * @deprecated Not GC or thread safe
  */
-export function js_string_to_mono_string(string: string): MonoString {
+export function stringToMonoStringUnsafe(string: string): MonoString {
     assert_legacy_interop();
     const temp = mono_wasm_new_root<MonoString>();
     try {
@@ -19,3 +19,20 @@ export function js_string_to_mono_string(string: string): MonoString {
         temp.release();
     }
 }
+
+// this is only used in legacy unit tests
+export function stringToMonoStringIntern(string: string): string {
+    if (string.length === 0)
+        return mono_wasm_empty_string;
+
+    const root = mono_wasm_new_root<MonoString>();
+    try {
+        stringToInternedMonoStringRoot(string, root);
+        const result = interned_string_table.get(root.value);
+        mono_assert(!is_nullish(result), "internal error: interned_string_table did not contain string after stringToMonoStringIntern");
+        return result;
+    }
+    finally {
+        root.release();
+    }
+}

src/mono/wasm/runtime/rollup.config.js

@@ -28,7 +28,7 @@ const terserConfig = {
     mangle: {
         // because of stack walk at src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
         // and unit test at src\libraries\System.Runtime.InteropServices.JavaScript\tests\System.Runtime.InteropServices.JavaScript.Legacy.UnitTests\timers.mjs
-        keep_fnames: /(mono_wasm_runtime_ready|mono_wasm_fire_debugger_agent_message_with_data|mono_wasm_fire_debugger_agent_message_with_data_to_pause|mono_wasm_set_timeout_exec)/,
+        keep_fnames: /(mono_wasm_runtime_ready|mono_wasm_fire_debugger_agent_message_with_data|mono_wasm_fire_debugger_agent_message_with_data_to_pause|mono_wasm_schedule_timer_tick)/,
         keep_classnames: /(ManagedObject|ManagedError|Span|ArraySegment|WasmRootBuffer|SessionOptionsBuilder)/,
     },
 };

src/mono/wasm/runtime/scheduling.ts

@@ -30,15 +30,17 @@ export function prevent_timer_throttling(): void {
     const light_throttling_frequency = 1000;
     for (let schedule = next_reach_time; schedule < desired_reach_time; schedule += light_throttling_frequency) {
         const delay = schedule - now;
-        setTimeout(() => {
-            cwraps.mono_wasm_execute_timer();
-            pump_count++;
-            mono_background_exec_until_done();
-        }, delay);
+        globalThis.setTimeout(prevent_timer_throttling_tick, delay);
     }
     spread_timers_maximum = desired_reach_time;
 }
 
+function prevent_timer_throttling_tick() {
+    cwraps.mono_wasm_execute_timer();
+    pump_count++;
+    mono_background_exec_until_done();
+}
+
 function mono_background_exec_until_done() {
     while (pump_count > 0) {
         --pump_count;
@@ -48,14 +50,18 @@ function mono_background_exec_until_done() {
 
 export function schedule_background_exec(): void {
     ++pump_count;
-    setTimeout(mono_background_exec_until_done, 0);
+    globalThis.setTimeout(mono_background_exec_until_done, 0);
 }
 
 let lastScheduledTimeoutId: any = undefined;
 export function mono_wasm_schedule_timer(shortestDueTimeMs: number): void {
     if (lastScheduledTimeoutId) {
-        clearTimeout(lastScheduledTimeoutId);
+        globalThis.clearTimeout(lastScheduledTimeoutId);
         lastScheduledTimeoutId = undefined;
     }
-    lastScheduledTimeoutId = setTimeout(cwraps.mono_wasm_execute_timer, shortestDueTimeMs);
+    lastScheduledTimeoutId = globalThis.setTimeout(mono_wasm_schedule_timer_tick, shortestDueTimeMs);
+}
+
+function mono_wasm_schedule_timer_tick() {
+    cwraps.mono_wasm_execute_timer();
 }

src/mono/wasm/runtime/strings.ts

@@ -170,7 +170,7 @@ export function stringToMonoStringRoot(string: string, result: WasmRoot<MonoStri
             }
         }
 
-        js_string_to_mono_string_new_root(string, result);
+        stringToMonoStringNewRoot(string, result);
     }
 }
 
@@ -189,7 +189,7 @@ export function stringToInternedMonoStringRoot(string: string | symbol, result:
     if (typeof (text) !== "string") {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        throw new Error(`Argument to js_string_to_mono_string_interned must be a string but was ${string}`);
+        throw new Error(`Argument to stringToInternedMonoStringRoot must be a string but was ${string}`);
     }
 
     if ((text.length === 0) && _empty_string_ptr) {
@@ -203,11 +203,11 @@ export function stringToInternedMonoStringRoot(string: string | symbol, result:
         return;
     }
 
-    js_string_to_mono_string_new_root(text, result);
-    _store_string_in_intern_table(text, result, true);
+    stringToMonoStringNewRoot(text, result);
+    storeStringInInternTable(text, result, true);
 }
 
-function _store_string_in_intern_table(string: string, root: WasmRoot<MonoString>, internIt: boolean): void {
+function storeStringInInternTable(string: string, root: WasmRoot<MonoString>, internIt: boolean): void {
     if (!root.value)
         throw new Error("null pointer passed to _store_string_in_intern_table");
 
@@ -245,7 +245,7 @@ function _store_string_in_intern_table(string: string, root: WasmRoot<MonoString
     rootBuffer.copy_value_from_address(index, root.address);
 }
 
-function js_string_to_mono_string_new_root(string: string, result: WasmRoot<MonoString>): void {
+function stringToMonoStringNewRoot(string: string, result: WasmRoot<MonoString>): void {
     const bufferLen = (string.length + 1) * 2;
     const buffer = Module._malloc(bufferLen);
     stringToUTF16(buffer as any, buffer as any + bufferLen, string);

src/mono/wasm/test-main.js

@@ -213,7 +213,7 @@ const App = {
         if ((arguments.length > 2) && (typeof (signature) !== "string"))
             throw new Error("Invalid number of arguments for call_test_method");
 
-        const fqn = "[System.Runtime.InteropServices.JavaScript.Legacy.UnitTests]System.Runtime.InteropServices.JavaScript.Tests.HelperMarshal:" + method_name;
+        const fqn = "[System.Runtime.InteropServices.JavaScript.Legacy.Tests]System.Runtime.InteropServices.JavaScript.Tests.HelperMarshal:" + method_name;
         try {
             const method = App.runtime.BINDING.bind_static_method(fqn, signature);
             return method.apply(null, args || []);