Merge branch 'main' into browser_memory_snapshot3

# Conflicts:
#	src/mono/wasm/runtime/assets.ts
#	src/mono/wasm/runtime/imports.ts
#	src/mono/wasm/runtime/managed-exports.ts
#	src/mono/wasm/runtime/marshal.ts
#	src/mono/wasm/runtime/startup.ts
#	src/mono/wasm/runtime/types.ts

src/mono/wasm/runtime/imports.ts

@@ -9,8 +9,7 @@ import type { CreateDotnetRuntimeType, DotnetModule, RuntimeAPI, EarlyExports, E
 import type { EmscriptenModule, EmscriptenModuleInternal } from "./types/emscripten";
 
 // these are our public API (except internal)
-export let Module: EmscriptenModule & DotnetModule;
-export let anyModule: any = undefined;
+export let Module: EmscriptenModule & DotnetModule & EmscriptenModuleInternal;
 export let INTERNAL: any;
 export let IMPORTS: any;
 
@@ -30,7 +29,7 @@ export function set_imports_exports(
 ): void {
     INTERNAL = exports.internal;
     IMPORTS = exports.marshaled_imports;
-    anyModule = Module = exports.module;
+    Module = exports.module;
 
     ENVIRONMENT_IS_NODE = imports.isNode;
     ENVIRONMENT_IS_SHELL = imports.isShell;

src/mono/wasm/runtime/managed-exports.ts

@@ -3,7 +3,7 @@
 
 import { GCHandle, MarshalerToCs, MarshalerToJs, MonoMethod, mono_assert } from "./types";
 import cwraps from "./cwraps";
-import { runtimeHelpers, ENVIRONMENT_IS_PTHREAD, anyModule } from "./imports";
+import { runtimeHelpers, ENVIRONMENT_IS_PTHREAD, Module } from "./imports";
 import { alloc_stack_frame, get_arg, get_arg_gc_handle, MarshalerType, set_arg_type, set_gc_handle } from "./marshal";
 import { invoke_method_and_handle_exception } from "./invoke-cs";
 import { marshal_array_to_cs_impl, marshal_exception_to_cs, marshal_intptr_to_cs } from "./marshal-to-cs";

src/mono/wasm/runtime/marshal.ts

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 import { js_owned_gc_handle_symbol, teardown_managed_proxy } from "./gc-handles";
-import { anyModule, Module, runtimeHelpers } from "./imports";
+import { Module, runtimeHelpers } from "./imports";
 import { getF32, getF64, getI16, getI32, getI64Big, getU16, getU32, getU8, setF32, setF64, setI16, setI32, setI64Big, setU16, setU32, setU8 } from "./memory";
 import { mono_wasm_new_external_root } from "./roots";
 import { mono_assert, GCHandle, JSHandle, MonoObject, MonoString, GCHandleNull, JSMarshalerArguments, JSFunctionSignature, JSMarshalerType, JSMarshalerArgument, MarshalerToJs, MarshalerToCs, WasmRoot } from "./types";
@@ -41,7 +41,7 @@ export const JSMarshalerTypeSize = 32;
 export const JSMarshalerSignatureHeaderSize = 4 + 4; // without Exception and Result
 
 export function alloc_stack_frame(size: number): JSMarshalerArguments {
-    const args = anyModule.stackAlloc(JavaScriptMarshalerArgSize * size);
+    const args = Module.stackAlloc(JavaScriptMarshalerArgSize * size) as any;
     mono_assert(args && (<any>args) % 8 == 0, "Arg alignment");
     const exc = get_arg(args, 0);
     set_arg_type(exc, MarshalerType.None);

src/mono/wasm/runtime/polyfills.ts

@@ -3,7 +3,7 @@
 
 import BuildConfiguration from "consts:configuration";
 import MonoWasmThreads from "consts:monoWasmThreads";
-import { anyModule, ENVIRONMENT_IS_NODE, ENVIRONMENT_IS_SHELL, ENVIRONMENT_IS_WEB, ENVIRONMENT_IS_WORKER, INTERNAL, Module, runtimeHelpers } from "./imports";
+import { ENVIRONMENT_IS_NODE, ENVIRONMENT_IS_SHELL, ENVIRONMENT_IS_WEB, ENVIRONMENT_IS_WORKER, INTERNAL, Module, runtimeHelpers } from "./imports";
 import { afterUpdateGlobalBufferAndViews } from "./memory";
 import { replaceEmscriptenPThreadLibrary } from "./pthreads/shared/emscripten-replacements";
 import { DotnetModuleConfigImports, EarlyReplacements } from "./types";

src/mono/wasm/runtime/startup.ts

@@ -4,8 +4,8 @@
 import BuildConfiguration from "consts:configuration";
 import MonoWasmThreads from "consts:monoWasmThreads";
 import WasmEnableLegacyJsInterop from "consts:WasmEnableLegacyJsInterop";
-import { CharPtrNull, DotnetModule, RuntimeAPI, MonoConfig, MonoConfigInternal } from "./types";
-import { anyModule, ENVIRONMENT_IS_NODE, ENVIRONMENT_IS_SHELL, INTERNAL, Module, runtimeHelpers } from "./imports";
+import { CharPtrNull, DotnetModule, RuntimeAPI, MonoConfig, MonoConfigInternal, DotnetModuleInternal } from "./types";
+import { ENVIRONMENT_IS_NODE, ENVIRONMENT_IS_SHELL, INTERNAL, Module, runtimeHelpers } from "./imports";
 import cwraps, { init_c_exports } from "./cwraps";
 import { mono_wasm_raise_debug_event, mono_wasm_runtime_ready } from "./debug";
 import { get_preferred_icu_asset, mono_wasm_globalization_init } from "./icu";
@@ -494,7 +494,7 @@ async function instantiate_wasm_module(
 
         if (runtimeHelpers.useMemorySnapshot) {
             try {
-                const wasmMemory = anyModule.asm.memory;
+                const wasmMemory = Module.asm.memory;
                 // .grow() takes a delta compared to the previous size
                 wasmMemory.grow((memorySize! - wasmMemory.buffer.byteLength + 65535) >>> 16);
                 runtimeHelpers.updateGlobalBufferAndViews(wasmMemory.buffer);
@@ -680,6 +680,7 @@ function normalizeConfig() {
             console.info("MONO_WASM: failed to detect timezone, will fallback to UTC");
         }
     }
+    runtimeHelpers.waitForDebugger = config.waitForDebugger;
 }
 
 export function mono_wasm_asm_loaded(assembly_name: CharPtr, assembly_ptr: number, assembly_len: number, pdb_ptr: number, pdb_len: number): void {

src/mono/wasm/runtime/types/emscripten.ts

@@ -70,6 +70,7 @@ export declare interface EmscriptenModuleInternal {
     mainScriptUrlOrBlob?: string;
     wasmModule: WebAssembly.Instance | null;
     ready: Promise<unknown>;
+    asm: { memory: WebAssembly.Memory };
     getWasmTableEntry(index: number): any;
     removeRunDependency(id: string): void;
     addRunDependency(id: string): void;