fix

Author: pavelsavara

src/mono/browser/browser.proj

@@ -265,9 +265,6 @@
     <ItemGroup Condition="'$(WasmEnableThreads)' == 'true'">
       <EmccExportedFunction Include="_emscripten_main_runtime_thread_id"  />
     </ItemGroup>
-    <ItemGroup Condition="'$(WasmEnableThreads)' == 'true'">
-      <EmccExportedFunction Include="_emscripten_main_runtime_thread_id"  />
-    </ItemGroup>
     <PropertyGroup>
       <_EmccExportedLibraryFunction>"[@(EmccExportedLibraryFunction -> '%27%(Identity)%27', ',')]"</_EmccExportedLibraryFunction>
       <_EmccExportedRuntimeMethods>"[@(EmccExportedRuntimeMethod -> '%27%(Identity)%27', ',')]"</_EmccExportedRuntimeMethods>

src/mono/browser/runtime/driver.c

@@ -188,6 +188,10 @@ mono_wasm_load_runtime (int debug_level)
 	runtime_initialized = 1;
 	const char *interp_opts = "";
 
+#ifndef DISABLE_THREADS
+	mono_memory_barrier ();
+#endif /* DISABLE_THREADS */
+
 #ifndef INVARIANT_GLOBALIZATION
 	mono_wasm_link_icu_shim ();
 #endif
@@ -230,6 +234,11 @@ mono_wasm_load_runtime (int debug_level)
 	root_domain = mono_wasm_load_runtime_common (debug_level, wasm_trace_logger, interp_opts);
 
 	bindings_initialize_internals();
+
+#ifndef DISABLE_THREADS
+	mono_memory_barrier ();
+#endif /* DISABLE_THREADS */
+
 }
 
 int initialize_runtime()

src/mono/browser/runtime/pthreads/deputy-thread.ts

@@ -39,6 +39,7 @@ export function mono_wasm_start_deputy_thread_async () {
                     }
                 });
 
+                forceThreadMemoryViewRefresh();
                 await start_runtime();
 
                 postMessageToMain({

src/mono/browser/runtime/pthreads/ui-thread.ts

@@ -9,6 +9,7 @@ import { MonoWorkerToMainMessage, monoThreadInfo, mono_wasm_pthread_ptr, update_
 import { Module, ENVIRONMENT_IS_WORKER, createPromiseController, loaderHelpers, mono_assert, runtimeHelpers } from "../globals";
 import { PThreadLibrary, MainToWorkerMessageType, MonoThreadMessage, PThreadInfo, PThreadPtr, PThreadPtrNull, PThreadWorker, PromiseController, Thread, WorkerToMainMessageType, monoMessageSymbol } from "../types/internal";
 import { mono_log_info, mono_log_debug, mono_log_warn } from "../logging";
+import { forceThreadMemoryViewRefresh } from "../memory";
 
 const threadPromises: Map<PThreadPtr, PromiseController<Thread>[]> = new Map();
 
@@ -71,6 +72,8 @@ function monoWorkerMessageHandler (worker: PThreadWorker, ev: MessageEvent<any>)
         return;
     }
 
+    forceThreadMemoryViewRefresh();
+
     let thread: Thread;
     pthreadId = message.info?.pthreadId ?? 0;
     worker.info = Object.assign({}, worker.info, message.info);

src/mono/browser/runtime/startup.ts

@@ -28,7 +28,7 @@ import { populateEmscriptenPool, mono_wasm_init_threads } from "./pthreads";
 import { currentWorkerThreadEvents, dotnetPthreadCreated, initWorkerThreadEvents, monoThreadInfo } from "./pthreads";
 import { mono_wasm_pthread_ptr, update_thread_info } from "./pthreads";
 import { jiterpreter_allocate_tables } from "./jiterpreter-support";
-import { localHeapViewU8, malloc } from "./memory";
+import { forceThreadMemoryViewRefresh, localHeapViewU8, malloc } from "./memory";
 import { assertNoProxies } from "./gc-handles";
 import { runtimeList } from "./exports";
 import { nativeAbort, nativeExit } from "./run";
@@ -321,6 +321,7 @@ async function onRuntimeInitializedAsync (userOnRuntimeInitialized: (module:Emsc
         await wait_for_all_assets();
 
         if (WasmEnableThreads) {
+            forceThreadMemoryViewRefresh();
             runtimeHelpers.deputyWorker.thread!.postMessageToWorker({
                 type:"deputyThread",
                 cmd: MainToWorkerMessageType.allAssetsLoaded,

src/mono/mono/utils/mono-memory-model.h

@@ -41,9 +41,6 @@ mono_memory_barrier (void)
 static inline void
 mono_memory_barrier (void)
 {
-#if defined(HOST_BROWSER)
-	emscripten_atomic_fence();
-#endif
 	__sync_synchronize ();
 }