Add source map loading support to MINIMAL_RUNTIME. (#25324)

Fixes minimal0.test_ubsan_full_stack_trace_gsource_map

Author: juj

.circleci/config.yml

@@ -751,6 +751,7 @@ jobs:
             wasmfs.test_fs_llseek_rawfs
             wasmfs.test_freetype
             minimal0.test_utf
+            minimal0.test_ubsan_full_stack_trace_gsource_map
             minimal0.test_static_variable
             minimal0.test_stack_overflow
             omitexports0.test_asyncify_longjmp

src/postamble.js

@@ -8,7 +8,7 @@
 
 #if PROXY_TO_WORKER
 if (ENVIRONMENT_IS_WORKER) {
-#include "webGLWorker.js'
+#include "webGLWorker.js"
 #include "proxyWorker.js"
 }
 #endif

src/postamble_minimal.js

@@ -4,6 +4,10 @@
  * SPDX-License-Identifier: MIT
  */
 
+#if LOAD_SOURCE_MAP
+#include "source_map_support.js"
+#endif
+
 // === Auto-generated postamble setup entry stuff ===
 #if HAS_MAIN // Only if user is exporting a C main(), we will generate a run() function that can be used to launch main.
 
@@ -267,16 +271,33 @@ WebAssembly.instantiate(Module['wasm'], imports).then(/** @suppress {missingProp
 
   initRuntime(wasmExports);
 
-#if PTHREADS && PTHREAD_POOL_SIZE
-  var workersReady = PThread.loadWasmModuleToAllWorkers();
-#if PTHREAD_POOL_DELAY_LOAD
-  ready();
-#else
-  workersReady.then(ready);
-#endif
-#else
-  ready();
+{{{ function waitOnStartupPromisesAndEmitReady() {
+  var promises = [];
+  if (PTHREADS && PTHREAD_POOL_SIZE) {
+    promises.push('PThread.loadWasmModuleToAllWorkers()');
+  }
+  if (LOAD_SOURCE_MAP) {
+    promises.push('getSourceMapAsync().then(json=>{receiveSourceMapJSON(json)})');
+  }
+  if (promises.length == 0) {
+    return 'ready();'
+  } else if (promises.length == 1) {
+    return `${promises[0]}.then(ready);`;
+  } else {
+    return `Promise.all(${', '.join(promises)}).then(ready);`
+  }
+}
+null;
+}}}
+
+#if PTHREADS && PTHREAD_POOL_SIZE && PTHREAD_POOL_DELAY_LOAD
+  // In PTHREAD_POOL_DELAY_LOAD mode, we kick off loading Wasm Module to all
+  // PThread Workers, but do not wait on it.
+  PThread.loadWasmModuleToAllWorkers();
 #endif
+
+{{{ waitOnStartupPromisesAndEmitReady(); }}}
+
 }
 
 #if WASM == 2

src/shell_minimal.js

@@ -130,10 +130,19 @@ function ready() {
 #endif
 }
 
+#if ENVIRONMENT_MAY_BE_NODE
+var isFileURI = (filename) => filename.startsWith('file://');
+var readAsync, readBinary;
+#include "node_shell_read.js"
+#endif
+
+#if ENVIRONMENT_MAY_BE_WORKER || PTHREADS
+var ENVIRONMENT_IS_WORKER = !!globalThis.WorkerGlobalScope;
+#endif
+
 #if PTHREADS
 // MINIMAL_RUNTIME does not support --proxy-to-worker option, so Worker and Pthread environments
 // coincide.
-var ENVIRONMENT_IS_WORKER = !!globalThis.WorkerGlobalScope;
 var ENVIRONMENT_IS_PTHREAD = ENVIRONMENT_IS_WORKER && self.name?.startsWith('em-pthread');
 
 #if !MODULARIZE

src/source_map_support.js

@@ -91,7 +91,11 @@ class WasmSourceMap {
 }
 
 var wasmSourceMap;
+#if MINIMAL_RUNTIME
+var wasmSourceMapFile = '{{{ WASM_BINARY_FILE }}}.map';
+#else
 var wasmSourceMapFile = locateFile('{{{ WASM_BINARY_FILE }}}.map');
+#endif
 
 function receiveSourceMapJSON(sourceMap) {
   wasmSourceMap = new WasmSourceMap(sourceMap);
@@ -103,7 +107,11 @@ function getSourceMap() {
 }
 
 async function getSourceMapAsync() {
-  if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
+  if (ENVIRONMENT_IS_WEB
+#if ENVIRONMENT_MAY_BE_WORKER
+   || ENVIRONMENT_IS_WORKER
+#endif
+   ) {
     try {
       var response = await fetch(wasmSourceMapFile, {{{ makeModuleReceiveExpr('fetchSettings', "{ credentials: 'same-origin' }") }}});
       return response.json();
@@ -120,6 +128,7 @@ async function getSourceMapAsync() {
 if ({{{ ENVIRONMENT_IS_MAIN_THREAD() }}}) {
 #endif
 
+#if !MINIMAL_RUNTIME // MINIMAL_RUNTIME integrates source map loading into postamble_minimal.js
 #if WASM_ASYNC_COMPILATION
 addRunDependency('source-map');
 getSourceMapAsync().then((json) => {
@@ -129,6 +138,7 @@ getSourceMapAsync().then((json) => {
 #else
 receiveSourceMapJSON(getSourceMap());
 #endif
+#endif
 
 #if PTHREADS || WASM_WORKERS
 }

test/test_other.py

@@ -9953,6 +9953,7 @@ def test_check_sourcemapurl_default(self, *args):
     source_mapping_url_content = webassembly.to_leb(len('sourceMappingURL')) + b'sourceMappingURL' + webassembly.to_leb(len('a.wasm.map')) + b'a.wasm.map'
     self.assertIn(source_mapping_url_content, output)
 
+  @also_with_minimal_runtime
   @parameterized({
     '': ([], [], []),
     'prefix_wildcard': ([], ['--prefix', '=wasm-src://'], []),