Merge branch 'main' into update_libcxx_libcxxabi_20

Author: aheejin

site/source/docs/compiling/Modularized-Output.rst

@@ -123,8 +123,9 @@ fix in future releses.  Current limitations include:
 
 * `ccall`/`cwrap` are not supported (depends on the ``Module`` global).
 
-* :ref:`abort_on_wasm_exceptions` is not supported (requires wrapping wasm
-  exports).
+* :ref:`dyncalls` is not supported (depends on the ``Module`` global)
+
+* :ref:`asyncify` is not supported (depends on :ref:`dyncalls`)
 
 * :ref:`asyncify_lazy_load_code` is not supported (depends on ``wasmExports``
   global)
@@ -166,15 +167,14 @@ This setting implicitly enables :ref:`export_es6` and sets :ref:`MODULARIZE` to
 
 Some additional limitations are:
 
-- ``-pthread`` / :ref:`wasm_workers` are not yet supported.
+* ``-pthread`` / :ref:`wasm_workers` are not yet supported.
 
-* :ref:`dyncalls` is not supported (depends on the ``Module`` global)
-
-* :ref:`asyncify` is not supported (depends on :ref:`dyncalls`)
+* :ref:`abort_on_wasm_exceptions` is not supported (requires wrapping wasm
+  exports).
 
-- Setting :ref:`wasm` to ``0`` is not supported.
+* Setting :ref:`wasm` to ``0`` is not supported.
 
-- Setting :ref:`wasm_async_compilation` to ``0`` is not supported.
+* Setting :ref:`wasm_async_compilation` to ``0`` is not supported.
 
 
 .. _Source phase imports: https://github.com/tc39/proposal-source-phase-imports

site/source/docs/porting/connecting_cpp_and_javascript/Interacting-with-code.rst

@@ -362,20 +362,18 @@ Implement a C API in JavaScript
 It is possible to implement a C API in JavaScript! This is the approach
 used in many of Emscripten's libraries, like SDL1 and OpenGL.
 
-You can use it to write your own APIs to call from C/C++. To do this
-you define the interface, decorating with ``extern`` to mark the methods
-in the API as external symbols. You then implement the symbols in
-JavaScript by simply adding their definition to `library.js`_ (by
-default). When compiling the C code, the compiler looks in the JavaScript
-libraries for relevant external symbols.
-
-By default, the implementation is added to **library.js** (and this is
-where you'll find parts of Emscripten's *libc*). You can put
-the JavaScript implementation in your own library file and add it using
-the :ref:`emcc option <emcc-js-library>` ``--js-library``. See
-`test_jslib`_ in **test/test_other.py** for a complete working
-example, including the syntax you should use inside the JavaScript library
-file.
+You can use it to write your own APIs to call from C/C++. To do this you define
+the interface, decorating with ``extern`` to mark the methods in the API as
+external symbols. You can then implement the symbols in JavaScript by simply
+adding their definition to one of the `core JS library`_ files.  Undefined 
+native symbols will be resolved by looking for them in JavaScript library files.
+
+The `core JS library`_ files are where you will find Emscripten internals. For
+example, parts of Emscripten's *libc* are implemented there. You can also put
+the JavaScript implementation in your own library file and add it using the
+:ref:`emcc option <emcc-js-library>` ``--js-library``. See `test_jslib`_ in
+**test/test_other.py** for a complete working example, including the syntax you
+should use inside the JavaScript library file.
 
 As a simple example, consider the case where you have some C code like this:
 
@@ -843,8 +841,8 @@ on Emscripten. If you would like to port existing Node-API addon to WebAssembly
 or compile the same binding code to both Node.js native addon and WebAssembly,
 you can give it a try. See `Emnapi documentation`_ for more details.
 
-.. _library.js: https://github.com/emscripten-core/emscripten/blob/main/src/library.js
-.. _test_jslib: https://github.com/emscripten-core/emscripten/blob/1.29.12/tests/test_core.py#L5043
+.. _core JS library: https://github.com/emscripten-core/emscripten/blob/main/src/lib/
+.. _test_jslib: https://github.com/emscripten-core/emscripten/blob/4.0.9/test/test_core.py#L6261
 .. _tools/system_libs.py: https://github.com/emscripten-core/emscripten/blob/main/tools/system_libs.py
 .. _library_\*.js: https://github.com/emscripten-core/emscripten/tree/main/src
 .. _test_add_function in test/test_core.py: https://github.com/emscripten-core/emscripten/blob/1.29.12/tests/test_core.py#L6237

src/lib/libcore.js

@@ -1729,13 +1729,25 @@ addToLibrary({
   },
 
 #if DYNCALLS || !WASM_BIGINT
-  $dynCalls__internal: true,
-  $dynCalls: {},
-  $dynCallLegacy__deps: ['$dynCalls'],
+#if MINIMAL_RUNTIME
+  $dynCalls: '{}',
+#endif
+  $dynCallLegacy__deps: [
+#if MINIMAL_RUNTIME
+    '$dynCalls',
+#endif
+#if MODULARIZE == 'instance'
+    () => error('dynCallLegacy is not yet compatible with MODULARIZE=instance'),
+#endif
+  ],
   $dynCallLegacy: (sig, ptr, args) => {
     sig = sig.replace(/p/g, {{{ MEMORY64 ? "'j'" : "'i'" }}})
 #if ASSERTIONS
+#if MINIMAL_RUNTIME
     assert(sig in dynCalls, `bad function pointer type - sig is not in dynCalls: '${sig}'`);
+#else
+    assert(('dynCall_' + sig) in Module, `bad function pointer type - dynCall function not found for sig '${sig}'`);
+#endif
     if (args?.length) {
 #if WASM_BIGINT
       // j (64-bit integer) is fine, and is implemented as a BigInt. Without
@@ -1750,7 +1762,11 @@ addToLibrary({
       assert(sig.length == 1);
     }
 #endif
+#if MINIMAL_RUNTIME
     var f = dynCalls[sig];
+#else
+    var f = Module['dynCall_' + sig];
+#endif
     return f(ptr, ...args);
   },
 #if DYNCALLS
@@ -2274,6 +2290,18 @@ addToLibrary({
   $wasmTable: undefined,
 #endif
 
+  $getUniqueRunDependency: (id) => {
+#if ASSERTIONS
+    var orig = id;
+    while (1) {
+      if (!runDependencyTracking[id]) return id;
+      id = orig + Math.random();
+    }
+#else
+    return id;
+#endif
+  },
+
   $noExitRuntime__postset: () => addAtModule(makeModuleReceive('noExitRuntime')),
   $noExitRuntime: {{{ !EXIT_RUNTIME }}},
 

src/lib/libfs_shared.js

@@ -47,6 +47,7 @@ addToLibrary({
     '$asyncLoad',
     '$PATH_FS',
     '$FS_createDataFile',
+    '$getUniqueRunDependency',
 #if !MINIMAL_RUNTIME
     '$FS_handledByPreloadPlugin',
 #endif

src/lib/liblz4.js

@@ -6,7 +6,7 @@
 
 #if LZ4
 addToLibrary({
-  $LZ4__deps: ['$FS', '$preloadPlugins'],
+  $LZ4__deps: ['$FS', '$preloadPlugins', '$getUniqueRunDependency'],
   $LZ4: {
     DIR_MODE: {{{ cDefs.S_IFDIR | 0o777 }}},
     FILE_MODE: {{{ cDefs.S_IFREG | 0o777 }}},

src/preamble.js

@@ -295,18 +295,6 @@ var runDependencyTracking = {};
 var runDependencyWatcher = null;
 #endif
 
-function getUniqueRunDependency(id) {
-#if ASSERTIONS
-  var orig = id;
-  while (1) {
-    if (!runDependencyTracking[id]) return id;
-    id = orig + Math.random();
-  }
-#else
-  return id;
-#endif
-}
-
 function addRunDependency(id) {
   runDependencies++;
 

test/other/codesize/test_codesize_hello_O0.gzsize

@@ -1 +1 @@
-8287
+8294

test/other/codesize/test_codesize_hello_O0.jssize

@@ -1 +1 @@
-22193
+22216

test/other/codesize/test_codesize_minimal_O0.gzsize

@@ -1 +1 @@
-6591
+6598

test/other/codesize/test_codesize_minimal_O0.jssize

@@ -1 +1 @@
-17562
+17585

test/other/test_unoptimized_code_size.js.size

@@ -1 +1 @@
-53787
+53661

test/other/test_unoptimized_code_size_no_asserts.js.size

@@ -1 +1 @@
-27050
+26996

test/other/test_unoptimized_code_size_strict.js.size

@@ -1 +1 @@
-51837
+51711

test/test_core.py

@@ -212,6 +212,8 @@ def metafunc(self, jspi, *args, **kwargs):
       self.require_jspi()
     else:
       self.set_setting('ASYNCIFY')
+      if self.get_setting('MODULARIZE') == 'instance':
+        self.skipTest('MODULARIZE=instance is not compatible with ASYNCIFY=1')
     f(self, *args, **kwargs)
 
   parameterize(metafunc, {'': (False,),
@@ -231,6 +233,8 @@ def metafunc(self, asyncify, *args, **kwargs):
       self.require_jspi()
     elif asyncify == 1:
       self.set_setting('ASYNCIFY')
+      if self.get_setting('MODULARIZE') == 'instance':
+        self.skipTest('MODULARIZE=instance is not compatible with ASYNCIFY=1')
     else:
       assert asyncify == 0
     f(self, *args, **kwargs)
@@ -1881,7 +1885,7 @@ def test_emscripten_get_compiler_setting(self):
     self.set_setting('RETAIN_COMPILER_SETTINGS')
     self.do_runf(src, read_file(output).replace('waka', utils.EMSCRIPTEN_VERSION))
 
-  @no_esm_integration('WASM_ESM_INTEGRATION is not compatible with ASYNCIFY=1')
+  @no_modularize_instance('MODULARIZE=instance is not compatible with ASYNCIFY=1')
   def test_emscripten_has_asyncify(self):
     src = r'''
       #include <stdio.h>
@@ -6950,7 +6954,7 @@ def test_autodebug_wasm(self):
   ### Integration tests
 
   @crossplatform
-  @no_modularize_instance('ccall is not compatible with WASM_ESM_INTEGRATION')
+  @no_modularize_instance('ccall is not compatible with MODULARIZE=instance')
   def test_ccall(self):
     self.emcc_args.append('-Wno-return-stack-address')
     self.set_setting('EXPORTED_RUNTIME_METHODS', ['ccall', 'cwrap', 'STACK_SIZE'])
@@ -6995,7 +6999,7 @@ def test_ccall(self):
     if self.maybe_closure():
       self.do_core_test('test_ccall.cpp')
 
-  @no_modularize_instance('ccall is not compatible with WASM_ESM_INTEGRATION')
+  @no_modularize_instance('ccall is not compatible with MODULARIZE=instance')
   def test_ccall_cwrap_fast_path(self):
     self.emcc_args.append('-Wno-return-stack-address')
     self.set_setting('EXPORTED_RUNTIME_METHODS', ['ccall', 'cwrap'])
@@ -7020,7 +7024,7 @@ def test_EXPORTED_RUNTIME_METHODS(self):
     self.do_core_test('EXPORTED_RUNTIME_METHODS.c')
 
   @also_with_minimal_runtime
-  @no_esm_integration('WASM_ESM_INTEGRATION is not compatible with DYNCALLS')
+  @no_modularize_instance('uses dynCallLegacy')
   def test_dyncall_specific(self):
     if self.get_setting('WASM_BIGINT') != 0 and not self.is_wasm2js():
       # define DYNCALLS because this test does test calling them directly, and
@@ -7047,8 +7051,8 @@ def test_dyncall_specific(self):
     'legacy': (['-sDYNCALLS'],),
   })
   def test_dyncall_pointers(self, args):
-    if args and self.get_setting('WASM_ESM_INTEGRATION'):
-      self.skipTest('WASM_ESM_INTEGRATION is not compatible with DYNCALLS')
+    if args and self.get_setting('MODULARIZE') == 'instance' or self.get_setting('WASM_ESM_INTEGRATION'):
+      self.skipTest('dynCallLegacy is not yet compatible with MODULARIZE=instance')
     self.do_core_test('test_dyncall_pointers.c', emcc_args=args)
 
   @also_with_wasm_bigint
@@ -8064,7 +8068,7 @@ def test_vswprintf_utf8(self):
 
   # Test async sleeps in the presence of invoke_* calls, which can happen with
   # longjmp or exceptions.
-  @no_esm_integration('WASM_ESM_INTEGRATION is not compatible with ASYNCIFY=1')
+  @no_modularize_instance('MODULARIZE=instance is not compatible with ASYNCIFY=1')
   def test_asyncify_longjmp(self):
     self.set_setting('ASYNCIFY')
     self.set_setting('STRICT')
@@ -8124,11 +8128,11 @@ def test_async_loop(self):
     self.do_runf('main.c', 'hello 0\nhello 1\nhello 2\nhello 3\nhello 4\n')
 
   @requires_v8
-  @no_esm_integration('WASM_ESM_INTEGRATION is not compatible with ASYNCIFY=1')
+  @no_modularize_instance('MODULARIZE=instance is not compatible with ASYNCIFY=1')
   def test_async_hello_v8(self):
     self.test_async_hello()
 
-  @no_modularize_instance('ccall is not compatible with WASM_ESM_INTEGRATION')
+  @no_modularize_instance('ccall is not compatible with MODULARIZE=instance')
   def test_async_ccall_bad(self):
     # check bad ccall use
     # needs to flush stdio streams
@@ -8160,7 +8164,7 @@ def test_async_ccall_bad(self):
     self.do_runf('main.c', 'The call to main is running asynchronously.')
 
   @with_asyncify_and_jspi
-  @no_modularize_instance('ccall is not compatible with WASM_ESM_INTEGRATION')
+  @no_modularize_instance('ccall is not compatible with MODULARIZE=instance')
   def test_async_ccall_good(self):
     # check reasonable ccall use
     self.set_setting('ASYNCIFY')
@@ -8189,7 +8193,7 @@ def test_async_ccall_good(self):
     'exit_runtime': (True,),
   })
   @with_asyncify_and_jspi
-  @no_modularize_instance('ccall is not compatible with WASM_ESM_INTEGRATION')
+  @no_modularize_instance('ccall is not compatible with MODULARIZE=instance')
   def test_async_ccall_promise(self, exit_runtime):
     if self.get_setting('ASYNCIFY') == 2:
       self.set_setting('JSPI_EXPORTS', ['stringf', 'floatf'])
@@ -8229,7 +8233,7 @@ def test_async_ccall_promise(self, exit_runtime):
     self.emcc_args += ['--pre-js', 'pre.js']
     self.do_runf('main.c', 'stringf: first\nsecond\n6.4')
 
-  @no_esm_integration('WASM_ESM_INTEGRATION is not compatible with ASYNCIFY=1')
+  @no_modularize_instance('MODULARIZE=instance is not compatible with ASYNCIFY=1')
   def test_fibers_asyncify(self):
     self.set_setting('ASYNCIFY')
     self.maybe_closure()
@@ -8240,7 +8244,7 @@ def test_asyncify_unused(self):
     # test a program not using asyncify, but the pref is set
     self.do_core_test('test_hello_world.c')
 
-  @no_esm_integration('WASM_ESM_INTEGRATION is not compatible with ASYNCIFY=1')
+  @no_modularize_instance('MODULARIZE=instance is not compatible with ASYNCIFY=1')
   @parameterized({
     'normal': ([], True),
     'removelist_a': (['-sASYNCIFY_REMOVE=["foo(int, double)"]'], False),
@@ -8288,7 +8292,7 @@ def test_asyncify_lists(self, args, should_pass, response=None):
     # virt() manually, rather than have them inferred automatically.
     'add_no_prop': (['-sASYNCIFY_IGNORE_INDIRECT', '-sASYNCIFY_ADD=["__original_main","main","virt()"]', '-sASYNCIFY_PROPAGATE_ADD=0'], True),
   })
-  @no_esm_integration('WASM_ESM_INTEGRATION is not compatible with ASYNCIFY=1')
+  @no_modularize_instance('MODULARIZE=instance is not compatible with ASYNCIFY=1')
   def test_asyncify_indirect_lists(self, args, should_pass):
     self.set_setting('ASYNCIFY')
     self.emcc_args += args
@@ -8306,7 +8310,7 @@ def test_asyncify_indirect_lists(self, args, should_pass):
         raise
 
   @with_dylink_reversed
-  @no_esm_integration('WASM_ESM_INTEGRATION is not compatible with ASYNCIFY=1')
+  @no_modularize_instance('MODULARIZE=instance is not compatible with ASYNCIFY=1')
   def test_asyncify_side_module(self):
     self.set_setting('ASYNCIFY')
     self.set_setting('ASYNCIFY_IMPORTS', ['my_sleep'])
@@ -8336,12 +8340,12 @@ def test_asyncify_side_module(self):
     ''', 'before sleep\n42\n42\nafter sleep\n', header='void my_sleep(int);', force_c=True)
 
   @no_asan('asyncify stack operations confuse asan')
-  @no_esm_integration('WASM_ESM_INTEGRATION is not compatible with ASYNCIFY=1')
+  @no_modularize_instance('MODULARIZE=instance is not compatible with ASYNCIFY=1')
   def test_emscripten_scan_registers(self):
     self.set_setting('ASYNCIFY')
     self.do_core_test('test_emscripten_scan_registers.cpp')
 
-  @no_esm_integration('WASM_ESM_INTEGRATION is not compatible with ASYNCIFY=1')
+  @no_modularize_instance('MODULARIZE=instance is not compatible with ASYNCIFY=1')
   def test_asyncify_assertions(self):
     self.set_setting('ASYNCIFY')
     self.set_setting('ASYNCIFY_IMPORTS', ['suspend'])
@@ -8350,7 +8354,7 @@ def test_asyncify_assertions(self):
 
   @no_lsan('leaks asyncify stack during exit')
   @no_asan('leaks asyncify stack during exit')
-  @no_esm_integration('WASM_ESM_INTEGRATION is not compatible with ASYNCIFY=1')
+  @no_modularize_instance('MODULARIZE=instance is not compatible with ASYNCIFY=1')
   def test_asyncify_during_exit(self):
     self.set_setting('ASYNCIFY')
     self.set_setting('ASSERTIONS')
@@ -9540,7 +9544,7 @@ def test_emscripten_stack(self):
     self.do_core_test('test_stack_get_free.c')
 
   # Tests settings.ABORT_ON_WASM_EXCEPTIONS
-  @no_modularize_instance('ABORT_ON_WASM_EXCEPTIONS')
+  @no_modularize_instance('ccall is not compatible with MODULARIZE=instance')
   def test_abort_on_exceptions(self):
     self.set_setting('ABORT_ON_WASM_EXCEPTIONS')
     self.set_setting('ALLOW_TABLE_GROWTH')
@@ -9549,7 +9553,7 @@ def test_abort_on_exceptions(self):
     self.emcc_args += ['-lembind', '--post-js', test_file('core/test_abort_on_exceptions_post.js')]
     self.do_core_test('test_abort_on_exceptions.cpp', interleaved_output=False)
 
-  @no_modularize_instance('ABORT_ON_WASM_EXCEPTIONS')
+  @no_esm_integration('ABORT_ON_WASM_EXCEPTIONS is not compatible with WASM_ESM_INTEGRATION')
   def test_abort_on_exceptions_main(self):
     # The unhandled exception wrappers should not kick in for exceptions thrown during main
     self.set_setting('ABORT_ON_WASM_EXCEPTIONS')
@@ -9563,7 +9567,7 @@ def test_abort_on_exceptions_main(self):
 
   @node_pthreads
   @flaky('https://github.com/emscripten-core/emscripten/issues/20067')
-  @no_modularize_instance('ABORT_ON_WASM_EXCEPTIONS')
+  @no_esm_integration('ABORT_ON_WASM_EXCEPTIONS is not compatible with WASM_ESM_INTEGRATION')
   def test_abort_on_exceptions_pthreads(self):
     self.set_setting('ABORT_ON_WASM_EXCEPTIONS')
     self.set_setting('PROXY_TO_PTHREAD')