Skip to content

Commit f51a250

Browse files
authored
[MODULARIZE=instance] Mark ABORT_ON_WASM_EXCEPTIONS is not supported. NFC (#24331)
1 parent fccabd1 commit f51a250

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,11 @@ fix in future releses. Current limitations include:
119119
object does not work. This is because symbols are exported directly using
120120
ES6 module syntax rathar than using a global `Module` object.
121121

122-
* `ccall`/`cwrap`, these depend on the internal `Module` object.
122+
* `ccall`/`cwrap` are not supported (these depend on the internal `Module`
123+
object).
124+
125+
* :ref:`abort_on_wasm_exceptions` is not supported (requires wrapping wasm
126+
exports).
123127

124128

125129
Source Phase Imports (experimental)

test/test_core.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9453,6 +9453,7 @@ def test_emscripten_stack(self):
94539453
self.do_core_test('test_stack_get_free.c')
94549454

94559455
# Tests settings.ABORT_ON_WASM_EXCEPTIONS
9456+
@no_modularize_instance('ABORT_ON_WASM_EXCEPTIONS')
94569457
def test_abort_on_exceptions(self):
94579458
self.set_setting('ABORT_ON_WASM_EXCEPTIONS')
94589459
self.set_setting('ALLOW_TABLE_GROWTH')

tools/link.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -810,9 +810,11 @@ def limit_incoming_module_api():
810810
default_setting('INCOMING_MODULE_JS_API', [])
811811

812812
if settings.MODULARIZE == 'instance':
813-
diagnostics.warning('experimental', '-sMODULARIZE=instance is still experimental. Many features may not work or will change.')
813+
diagnostics.warning('experimental', 'MODULARIZE=instance is still experimental. Many features may not work or will change.')
814814
if options.oformat != OFormat.MJS:
815-
exit_with_error('MODULARIZE instance is only compatible with ES module output format')
815+
exit_with_error('MODULARIZE=instance is only compatible with ES module output format')
816+
if settings.ABORT_ON_WASM_EXCEPTIONS:
817+
exit_with_error('MODULARIZE=instance is only compatible with ABORT_ON_WASM_EXCEPTIONS')
816818
if 'INCOMING_MODULE_JS_API' in user_settings:
817819
for s in ['wasmMemory', 'INITIAL_MEMORY']:
818820
if s in settings.INCOMING_MODULE_JS_API:

0 commit comments

Comments
 (0)