Merge remote-tracking branch 'origin/main' into arsnyder16-fcoverage

Author: arsnyder16

embuilder.py

@@ -88,6 +88,7 @@
     'libnoexit',
     'libwebgpu',
     'libwebgpu_cpp',
+    'bullet',
 ]
 
 # Additional tasks on top of MINIMAL_TASKS that are necessary for PIC testing on

src/closure-externs/modularize-externs.js

@@ -1,6 +1,7 @@
-// Due to the way MODULARIZE works, Closure is run on generated code that does not define _scriptName,
-// but only after MODULARIZE has finished, _scriptName is injected to the generated code.
-// Therefore it cannot be minified.
+// In MODULARIZE mode the JS code may be executed later, after `document.currentScript` is gone, so we store
+// it to `_scriptName` outside the wrapper function. Therefore, it cannot be minified.
+// In EXPORT_ES6 mode we use `import.meta.url` and for Node.js CommonJS builds we use `__filename`.
+
 /**
  * @suppress {duplicate, undefinedVars}
  */

src/lib/libcore.js

@@ -1642,11 +1642,6 @@ addToLibrary({
   $jstoi_q__docs: '/** @suppress {checkTypes} */',
   $jstoi_q: (str) => parseInt(str),
 
-  // Converts a JS string to an integer base-10, with signaling error
-  // handling (throws a JS exception on error). E.g. jstoi_s("123abc")
-  // throws an exception.
-  $jstoi_s: 'Number',
-
 #if LINK_AS_CXX
   // libunwind
 

src/lib/libembind_gen.js

@@ -347,7 +347,7 @@ var LibraryEmbind = {
       out.push('\n};\n\n');
     }
   },
-  $TsPrinter__deps: ['$OptionalType'],
+  $TsPrinter__deps: ['$OptionalType', '$ClassDefinition'],
   $TsPrinter: class {
     constructor(definitions) {
       this.definitions = definitions;

src/lib/liblegacy.js

@@ -116,6 +116,12 @@ legacyFuncs = {
   // Legacy names for runtime `out`/`err` symbols.
   $print: 'out',
   $printErr: 'err',
+
+  // Converts a JS string to an integer base-10. Despite _s, which
+  // suggests signaling error handling, this returns NaN on error.
+  // (This was a mistake in the original implementation, and kept
+  // to avoid breakage.)
+  $jstoi_s: 'Number',
 };
 
 if (WARN_DEPRECATED && !INCLUDE_FULL_LIBRARY) {

src/postlibrary.js

@@ -5,7 +5,9 @@
 function processModuleArgs() 
 #endif
 {
-#if IMPORTED_MEMORY
+#if IMPORTED_MEMORY && !WASM_ESM_INTEGRATION
+  // With WASM_ESM_INTEGRATION this has to happen at the top level and not
+  // delayed until processModuleArgs.
   initMemory();
 #endif
 

src/preamble.js

@@ -46,7 +46,7 @@ if (typeof WebAssembly != 'object') {
 
 // Wasm globals
 
-#if !WASM_ESM_INTEGRATION
+#if !WASM_ESM_INTEGRATION || IMPORTED_MEMORY
 var wasmMemory;
 #endif
 

src/runtime_init_memory.js

@@ -22,7 +22,7 @@ function initMemory() {
   } else
 #endif
   {
-    var INITIAL_MEMORY = {{{ makeModuleReceiveExpr('INITIAL_MEMORY', INITIAL_MEMORY) }}}
+    var INITIAL_MEMORY = {{{ makeModuleReceiveExpr('INITIAL_MEMORY', INITIAL_MEMORY) }}};
 
 #if ASSERTIONS
     assert(INITIAL_MEMORY >= {{{STACK_SIZE}}}, 'INITIAL_MEMORY should be larger than STACK_SIZE, was ' + INITIAL_MEMORY + '! (STACK_SIZE=' + {{{STACK_SIZE}}} + ')');
@@ -56,3 +56,6 @@ function initMemory() {
   updateMemoryViews();
 }
 
+#if WASM_ESM_INTEGRATION
+initMemory();
+#endif

src/shell.js

@@ -139,24 +139,32 @@ var quit_ = (status, toThrow) => {
   throw toThrow;
 };
 
-#if SHARED_MEMORY && !MODULARIZE
+#if EXPORT_ES6
+var _scriptName = import.meta.url;
+#else
+#if ENVIRONMENT_MAY_BE_WEB
+#if !MODULARIZE
 // In MODULARIZE mode _scriptName needs to be captured already at the very top of the page immediately when the page is parsed, so it is generated there
 // before the page load. In non-MODULARIZE modes generate it here.
-var _scriptName = (typeof document != 'undefined') ? document.currentScript?.src : undefined;
+var _scriptName = typeof document != 'undefined' ? document.currentScript?.src : undefined;
+#endif // !MODULARIZE
+#elif ENVIRONMENT_MAY_BE_NODE || ENVIRONMENT_MAY_BE_WORKER
+var _scriptName;
+#endif // ENVIRONMENT_MAY_BE_WEB
 
 #if ENVIRONMENT_MAY_BE_NODE
-if (ENVIRONMENT_IS_NODE) {
-#if EXPORT_ES6
-  _scriptName = typeof __filename != 'undefined' ? __filename : import.meta.url
-#else
+if (typeof __filename != 'undefined') { // Node
   _scriptName = __filename;
-#endif
 } else
 #endif // ENVIRONMENT_MAY_BE_NODE
+#if ENVIRONMENT_MAY_BE_WORKER
 if (ENVIRONMENT_IS_WORKER) {
   _scriptName = self.location.href;
 }
-#endif // SHARED_MEMORY && !MODULARIZE
+#elif ENVIRONMENT_MAY_BE_NODE
+  /*no-op*/{}
+#endif // ENVIRONMENT_MAY_BE_WORKER
+#endif // EXPORT_ES6
 
 // `/` should be present at the end if `scriptDirectory` is not empty
 var scriptDirectory = '';
@@ -197,11 +205,8 @@ if (ENVIRONMENT_IS_NODE) {
   var nodePath = require('path');
 
 #if EXPORT_ES6
-  // EXPORT_ES6 + ENVIRONMENT_IS_NODE always requires use of import.meta.url,
-  // since there's no way getting the current absolute path of the module when
-  // support for that is not available.
-  if (!import.meta.url.startsWith('data:')) {
-    scriptDirectory = nodePath.dirname(require('url').fileURLToPath(import.meta.url)) + '/';
+  if (_scriptName.startsWith('file:')) {
+    scriptDirectory = nodePath.dirname(require('url').fileURLToPath(_scriptName)) + '/';
   }
 #else
   scriptDirectory = __dirname + '/';
@@ -335,28 +340,11 @@ if (ENVIRONMENT_IS_SHELL) {
 // ENVIRONMENT_IS_NODE.
 #if ENVIRONMENT_MAY_BE_WEB || ENVIRONMENT_MAY_BE_WORKER
 if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
-  if (ENVIRONMENT_IS_WORKER) { // Check worker, not web, since window could be polyfilled
-    scriptDirectory = self.location.href;
-  } else if (typeof document != 'undefined' && document.currentScript) { // web
-    scriptDirectory = document.currentScript.src;
-  }
-#if MODULARIZE
-  // When MODULARIZE, this JS may be executed later, after document.currentScript
-  // is gone, so we saved it, and we use it here instead of any other info.
-  if (_scriptName) {
-    scriptDirectory = _scriptName;
-  }
-#endif
-  // blob urls look like blob:http://site.com/etc/etc and we cannot infer anything from them.
-  // otherwise, slice off the final part of the url to find the script directory.
-  // if scriptDirectory does not contain a slash, lastIndexOf will return -1,
-  // and scriptDirectory will correctly be replaced with an empty string.
-  // If scriptDirectory contains a query (starting with ?) or a fragment (starting with #),
-  // they are removed because they could contain a slash.
-  if (scriptDirectory.startsWith('blob:')) {
-    scriptDirectory = '';
-  } else {
-    scriptDirectory = scriptDirectory.slice(0, scriptDirectory.replace(/[?#].*/, '').lastIndexOf('/')+1);
+  try {
+    scriptDirectory = new URL('.', _scriptName).href; // includes trailing slash
+  } catch {
+    // Must be a `blob:` or `data:` URL (e.g. `blob:http://site.com/etc/etc`), we cannot
+    // infer anything from them.
   }
 
 #if ENVIRONMENT && ASSERTIONS

src/shell_minimal.js

@@ -134,7 +134,7 @@ var ENVIRONMENT_IS_PTHREAD = ENVIRONMENT_IS_WORKER && self.name?.startsWith('em-
 #if !MODULARIZE
 // In MODULARIZE mode _scriptName needs to be captured already at the very top of the page immediately when the page is parsed, so it is generated there
 // before the page load. In non-MODULARIZE modes generate it here.
-var _scriptName = (typeof document != 'undefined') ? document.currentScript?.src : undefined;
+var _scriptName = typeof document != 'undefined' ? document.currentScript?.src : undefined;
 #endif
 
 #if ENVIRONMENT_MAY_BE_NODE
@@ -145,9 +145,11 @@ if (ENVIRONMENT_IS_NODE) {
   // Under node we set `workerData` to `em-pthread` to signal that the worker
   // is hosting a pthread.
   ENVIRONMENT_IS_PTHREAD = ENVIRONMENT_IS_WORKER && worker_threads['workerData'] == 'em-pthread'
+#if !EXPORT_ES6
   _scriptName = __filename;
-} else
 #endif
+} else
+#endif // ENVIRONMENT_MAY_BE_NODE
 if (ENVIRONMENT_IS_WORKER) {
   _scriptName = self.location.href;
 }

src/wasm_worker.js

@@ -34,8 +34,11 @@ if (ENVIRONMENT_IS_NODE) {
   Object.assign(global, {
     self: global,
     require,
+#if !EXPORT_ES6
+    // `vm.runInThisContext` global scope lacks `__filename` and `__dirname`
     __filename,
     __dirname,
+#endif
     Worker: nodeWorkerThreads.Worker,
     importScripts: (f) => vm.runInThisContext(fs.readFileSync(f, 'utf8'), {filename: f}),
     postMessage: (msg) => parentPort.postMessage(msg),

test/browser/test_small_js_flags.js.size

@@ -1 +1 @@
-3996
+3934

test/common.py

@@ -1393,16 +1393,20 @@ def build(self, filename, libraries=None, includes=None, force_c=False, emcc_arg
       assert shared.suffix(filename) != '.c', 'force_c is not needed for source files ending in .c'
       compiler.append('-xc')
 
+    all_emcc_args = self.get_emcc_args(main_file=True)
+    if emcc_args:
+      all_emcc_args += emcc_args
     if not output_suffix:
-      output_suffix = '.mjs' if emcc_args and '-sEXPORT_ES6' in emcc_args else '.js'
+      if '-sEXPORT_ES6' in all_emcc_args or '-sWASM_ESM_INTEGRATION' in all_emcc_args:
+        output_suffix = '.mjs'
+      else:
+        output_suffix = '.js'
 
     if output_basename:
       output = output_basename + output_suffix
     else:
       output = shared.unsuffixed_basename(filename) + output_suffix
-    cmd = compiler + [filename, '-o', output] + self.get_emcc_args(main_file=True)
-    if emcc_args:
-      cmd += emcc_args
+    cmd = compiler + [filename, '-o', output] + all_emcc_args
     if libraries:
       cmd += libraries
     if includes:

test/other/codesize/test_codesize_cxx_ctors1.gzsize

@@ -1 +1 @@
-8237
+8208

test/other/codesize/test_codesize_cxx_ctors1.jssize

@@ -1 +1 @@
-19928
+19920

test/other/codesize/test_codesize_cxx_ctors2.gzsize

@@ -1 +1 @@
-8226
+8196

test/other/codesize/test_codesize_cxx_ctors2.jssize

@@ -1 +1 @@
-19906
+19898

test/other/codesize/test_codesize_cxx_except.gzsize

@@ -1 +1 @@
-9227
+9203

test/other/codesize/test_codesize_cxx_except.jssize

@@ -1 +1 @@
-23665
+23657

test/other/codesize/test_codesize_cxx_except_wasm.gzsize

@@ -1 +1 @@
-8178
+8156

test/other/codesize/test_codesize_cxx_except_wasm.jssize

@@ -1 +1 @@
-19821
+19813

test/other/codesize/test_codesize_cxx_except_wasm_legacy.gzsize

@@ -1 +1 @@
-8178
+8156

test/other/codesize/test_codesize_cxx_except_wasm_legacy.jssize

@@ -1 +1 @@
-19821
+19813

test/other/codesize/test_codesize_cxx_lto.gzsize

@@ -1 +1 @@
-8244
+8217

test/other/codesize/test_codesize_cxx_lto.jssize

@@ -1 +1 @@
-20003
+19994

test/other/codesize/test_codesize_cxx_mangle.gzsize

@@ -1 +1 @@
-9270
+9246

test/other/codesize/test_codesize_cxx_mangle.jssize

@@ -1 +1 @@
-23780
+23772

test/other/codesize/test_codesize_cxx_noexcept.gzsize

@@ -1 +1 @@
-8237
+8208

test/other/codesize/test_codesize_cxx_noexcept.jssize

@@ -1 +1 @@
-19928
+19920

test/other/codesize/test_codesize_cxx_wasmfs.gzsize

@@ -1 +1 @@
-3413
+3387

test/other/codesize/test_codesize_cxx_wasmfs.jssize

@@ -1 +1 @@
-7329
+7320

test/other/codesize/test_codesize_files_js_fs.gzsize

@@ -1 +1 @@
-7527
+7499

test/other/codesize/test_codesize_files_js_fs.jssize

@@ -1 +1 @@
-18510
+18501

test/other/codesize/test_codesize_files_wasmfs.gzsize

@@ -1 +1 @@
-2668
+2640

test/other/codesize/test_codesize_files_wasmfs.jssize

@@ -1 +1 @@
-5714
+5703

test/other/codesize/test_codesize_hello_O0.gzsize

@@ -1 +1 @@
-7805
+7785

test/other/codesize/test_codesize_hello_O0.jssize

@@ -1 +1 @@
-20758
+20761

test/other/codesize/test_codesize_hello_O1.gzsize

@@ -1 +1 @@
-2534
+2510

test/other/codesize/test_codesize_hello_O1.jssize

@@ -1 +1 @@
-6528
+6536

test/other/codesize/test_codesize_hello_O2.gzsize

@@ -1 +1 @@
-2193
+2170

test/other/codesize/test_codesize_hello_O2.jssize

@@ -1 +1 @@
-4508
+4497

test/other/codesize/test_codesize_hello_O3.gzsize

@@ -1 +1 @@
-2149
+2128

test/other/codesize/test_codesize_hello_O3.jssize

@@ -1 +1 @@
-4450
+4439

test/other/codesize/test_codesize_hello_Os.gzsize

@@ -1 +1 @@
-2149
+2128

test/other/codesize/test_codesize_hello_Os.jssize

@@ -1 +1 @@
-4450
+4439

test/other/codesize/test_codesize_hello_Oz.gzsize

@@ -1 +1 @@
-2149
+2128

test/other/codesize/test_codesize_hello_Oz.jssize

@@ -1 +1 @@
-4450
+4439

test/other/codesize/test_codesize_hello_dylink.gzsize

@@ -1 +1 @@
-11753
+11735

test/other/codesize/test_codesize_hello_dylink.jssize

@@ -1 +1 @@
-27782
+27774

test/other/codesize/test_codesize_hello_export_nothing.gzsize

@@ -1 +1 @@
-1545
+1520

test/other/codesize/test_codesize_hello_export_nothing.jssize

@@ -1 +1 @@
-3338
+3325

test/other/codesize/test_codesize_hello_single_file.gzsize

@@ -1 +1 @@
-3673
+3626

test/other/codesize/test_codesize_hello_single_file.jssize

@@ -1 +1 @@
-6732
+6690

test/other/codesize/test_codesize_hello_wasmfs.gzsize

@@ -1 +1 @@
-2149
+2128

test/other/codesize/test_codesize_hello_wasmfs.jssize

@@ -1 +1 @@
-4450
+4439

test/other/codesize/test_codesize_libcxxabi_message_O3.gzsize

@@ -1 +1 @@
-1736
+1713

test/other/codesize/test_codesize_libcxxabi_message_O3.jssize

@@ -1 +1 @@
-3713
+3700

test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.gzsize

@@ -1 +1 @@
-1769
+1745

test/other/codesize/test_codesize_libcxxabi_message_O3_standalone.jssize

@@ -1 +1 @@
-3756
+3743

test/other/codesize/test_codesize_mem_O3.gzsize

@@ -1 +1 @@
-2190
+2171

test/other/codesize/test_codesize_mem_O3.jssize

@@ -1 +1 @@
-4579
+4569

test/other/codesize/test_codesize_mem_O3_grow.gzsize

@@ -1 +1 @@
-2342
+2323

test/other/codesize/test_codesize_mem_O3_grow.jssize

@@ -1 +1 @@
-4864
+4854

test/other/codesize/test_codesize_mem_O3_grow_standalone.gzsize

@@ -1 +1 @@
-2035
+2013

test/other/codesize/test_codesize_mem_O3_grow_standalone.jssize

@@ -1 +1 @@
-4277
+4265

test/other/codesize/test_codesize_mem_O3_standalone.gzsize

@@ -1 +1 @@
-1999
+1977