Skip to content

Commit 3889bf5

Browse files
authored
Mark LEGACY_VM_SUPPORT as incompatible with MEMORY64 (#25183)
Even `-sMEMORY64=2` is not supported because out lowering pass doesn't yet support it: ``` Running test_core: (1 tests) test_embind_val_basics_legacy (test_core.wasm64l.test_embind_val_basics_legacy) ... Fatal: Memory64 and multi-memory not supported by memory.copy lowering em++: error: '/usr/local/google/home/sbc/dev/wasm/binaryen-out/bin/wasm-opt --signext-lowering --llvm-nontrapping-fptoint-lowering --llvm-memory-copy-fill-lowering --memory64-lowering --table64-lowering test_embind_val_basics.wasm -o test_embind_val_basics.wasm -g --mvp-features --enable-bulk-memory --enable-bulk-memory-opt --enable-call-indirect-overlong --enable-memory64 --enable-multivalue --enable-mutable-globals --enable-nontrapping-float-to-int --enable-reference-types --enable-sign-ext' failed (returned 1) None ``` Fixes: #25182
1 parent 300a596 commit 3889bf5

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,7 @@ jobs:
691691
wasm64l.test_bigswitch
692692
wasm64l.test_module_wasm_memory
693693
wasm64l.test_longjmp2_emscripten
694+
wasm64l.test_embind_val_basics_legacy
694695
other.test_failing_growth_wasm64"
695696
- upload-test-results
696697
test-jsc:

test/test_core.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7511,8 +7511,11 @@ def test2():
75117511
'no_dynamic': (['--bind', '-sDYNAMIC_EXECUTION=0', '-sLEGACY_VM_SUPPORT'],),
75127512
})
75137513
def test_embind_val_basics(self, args):
7514-
if '-sLEGACY_VM_SUPPORT' in args and (self.get_setting('MODULARIZE') == 'instance' or self.get_setting('WASM_ESM_INTEGRATION')):
7515-
self.skipTest('LEGACY_VM_SUPPORT is not compatible with EXPORT_ES6')
7514+
if '-sLEGACY_VM_SUPPORT':
7515+
if self.get_setting('MODULARIZE') == 'instance' or self.get_setting('WASM_ESM_INTEGRATION'):
7516+
self.skipTest('LEGACY_VM_SUPPORT is not compatible with EXPORT_ES6')
7517+
if self.is_wasm64():
7518+
self.skipTest('LEGACY_VM_SUPPORT is not compatible with wasm64')
75167519
self.maybe_closure()
75177520
self.do_run_in_out_file_test('embind/test_embind_val_basics.cpp', cflags=args)
75187521

tools/link.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,7 @@ def report_incompatible_settings():
674674
('GL_SUPPORT_AUTOMATIC_ENABLE_EXTENSIONS', 'NO_GL_SUPPORT_SIMPLE_ENABLE_EXTENSIONS', None),
675675
('MODULARIZE', 'NODEJS_CATCH_REJECTION', None),
676676
('MODULARIZE', 'NODEJS_CATCH_EXIT', None),
677+
('LEGACY_VM_SUPPORT', 'MEMORY64', None),
677678
]
678679

679680
for a, b, reason in incompatible_settings:

0 commit comments

Comments
 (0)