Skip to content

Commit 8af8100

Browse files
authored
[test] Remove node/v8 memory64 flags. NFC (#23308)
In the latest versions of node and v8 memory64 is not longer experimental. In the older versions, the experimental memory64 support is not compatible with the latest emscripten-generated memory64 modules (e.g. table64 is completely missing).
1 parent baf762b commit 8af8100

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ commands:
312312
# this flag for now: https://crbug.com/638180
313313
CHROME_FLAGS_BASE: "--no-first-run -start-maximized --no-sandbox --use-gl=swiftshader --user-data-dir=/tmp/chrome-emscripten-profile --enable-experimental-web-platform-features"
314314
CHROME_FLAGS_HEADLESS: "--headless=new --remote-debugging-port=1234"
315-
CHROME_FLAGS_WASM: "--enable-experimental-webassembly-features --js-flags=\"--experimental-wasm-memory64 --experimental-wasm-stack-switching --experimental-wasm-type-reflection\""
315+
CHROME_FLAGS_WASM: "--enable-experimental-webassembly-features --js-flags=\"--experimental-wasm-stack-switching --experimental-wasm-type-reflection\""
316316
CHROME_FLAGS_NOCACHE: "--disk-cache-dir=/dev/null --disk-cache-size=1 --media-cache-size=1 --disable-application-cache --incognito"
317317
command: |
318318
export EMTEST_BROWSER="/usr/bin/google-chrome $CHROME_FLAGS_BASE $CHROME_FLAGS_HEADLESS $CHROME_FLAGS_WASM $CHROME_FLAGS_NOCACHE"
@@ -402,7 +402,7 @@ commands:
402402
# this flag for now: https://crbug.com/638180
403403
CHROME_FLAGS_BASE: "--no-first-run -start-maximized --no-sandbox --use-gl=swiftshader --user-data-dir=/tmp/chrome-emscripten-profile"
404404
CHROME_FLAGS_HEADLESS: "--headless=new --remote-debugging-port=1234"
405-
CHROME_FLAGS_WASM: "--enable-experimental-webassembly-features --js-flags=\"--experimental-wasm-memory64\""
405+
CHROME_FLAGS_WASM: "--enable-experimental-webassembly-features"
406406
CHROME_FLAGS_NOCACHE: "--disk-cache-dir=/dev/null --disk-cache-size=1 --media-cache-size=1 --disable-application-cache --incognito"
407407
command: |
408408
export EMTEST_BROWSER="/usr/bin/google-chrome $CHROME_FLAGS_BASE $CHROME_FLAGS_HEADLESS $CHROME_FLAGS_WASM $CHROME_FLAGS_NOCACHE"

test/common.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -964,13 +964,11 @@ def require_wasm64(self):
964964
version = shared.get_node_version(nodejs)
965965
if version >= (23, 0, 0):
966966
self.js_engines = [nodejs]
967-
self.node_args += shared.node_memory64_flags()
968967
return
969968

970969
if config.V8_ENGINE and config.V8_ENGINE in self.js_engines:
971970
self.emcc_args.append('-sENVIRONMENT=shell')
972971
self.js_engines = [config.V8_ENGINE]
973-
self.v8_args.append('--experimental-wasm-memory64')
974972
return
975973

976974
if 'EMTEST_SKIP_WASM64' in os.environ:

tools/link.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -449,9 +449,7 @@ def check_human_readable_list(items):
449449
def make_js_executable(script):
450450
src = read_file(script)
451451
cmd = config.NODE_JS
452-
if settings.MEMORY64 == 1:
453-
cmd += shared.node_memory64_flags()
454-
elif settings.WASM_BIGINT:
452+
if settings.WASM_BIGINT:
455453
cmd += shared.node_bigint_flags(config.NODE_JS)
456454
if len(cmd) > 1 or not os.path.isabs(cmd[0]):
457455
# Using -S (--split-string) here means that arguments to the executable are

tools/shared.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,10 +394,6 @@ def node_reference_types_flags(nodejs):
394394
return []
395395

396396

397-
def node_memory64_flags():
398-
return ['--experimental-wasm-memory64']
399-
400-
401397
def node_exception_flags(nodejs):
402398
node_version = get_node_version(nodejs)
403399
# Exception handling was enabled by default in node v17.

0 commit comments

Comments
 (0)