From d9c1c0df72198d73b1b9901dbbc0c21dc9f4b551 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Mon, 6 Jan 2025 08:54:27 -0800 Subject: [PATCH] [test] Remove node/v8 memory64 flags. NFC 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). --- .circleci/config.yml | 4 ++-- test/common.py | 2 -- tools/link.py | 4 +--- tools/shared.py | 4 ---- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 78dd8b7383437..8d6faf2f153aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -312,7 +312,7 @@ commands: # this flag for now: https://crbug.com/638180 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" CHROME_FLAGS_HEADLESS: "--headless=new --remote-debugging-port=1234" - CHROME_FLAGS_WASM: "--enable-experimental-webassembly-features --js-flags=\"--experimental-wasm-memory64 --experimental-wasm-stack-switching --experimental-wasm-type-reflection\"" + CHROME_FLAGS_WASM: "--enable-experimental-webassembly-features --js-flags=\"--experimental-wasm-stack-switching --experimental-wasm-type-reflection\"" CHROME_FLAGS_NOCACHE: "--disk-cache-dir=/dev/null --disk-cache-size=1 --media-cache-size=1 --disable-application-cache --incognito" command: | export EMTEST_BROWSER="/usr/bin/google-chrome $CHROME_FLAGS_BASE $CHROME_FLAGS_HEADLESS $CHROME_FLAGS_WASM $CHROME_FLAGS_NOCACHE" @@ -402,7 +402,7 @@ commands: # this flag for now: https://crbug.com/638180 CHROME_FLAGS_BASE: "--no-first-run -start-maximized --no-sandbox --use-gl=swiftshader --user-data-dir=/tmp/chrome-emscripten-profile" CHROME_FLAGS_HEADLESS: "--headless=new --remote-debugging-port=1234" - CHROME_FLAGS_WASM: "--enable-experimental-webassembly-features --js-flags=\"--experimental-wasm-memory64\"" + CHROME_FLAGS_WASM: "--enable-experimental-webassembly-features" CHROME_FLAGS_NOCACHE: "--disk-cache-dir=/dev/null --disk-cache-size=1 --media-cache-size=1 --disable-application-cache --incognito" command: | export EMTEST_BROWSER="/usr/bin/google-chrome $CHROME_FLAGS_BASE $CHROME_FLAGS_HEADLESS $CHROME_FLAGS_WASM $CHROME_FLAGS_NOCACHE" diff --git a/test/common.py b/test/common.py index 541d89aaca73f..04c02ab73d069 100644 --- a/test/common.py +++ b/test/common.py @@ -964,13 +964,11 @@ def require_wasm64(self): version = shared.get_node_version(nodejs) if version >= (23, 0, 0): self.js_engines = [nodejs] - self.node_args += shared.node_memory64_flags() return if config.V8_ENGINE and config.V8_ENGINE in self.js_engines: self.emcc_args.append('-sENVIRONMENT=shell') self.js_engines = [config.V8_ENGINE] - self.v8_args.append('--experimental-wasm-memory64') return if 'EMTEST_SKIP_WASM64' in os.environ: diff --git a/tools/link.py b/tools/link.py index c7c5ffdb0f4cf..b8e7042dcde00 100644 --- a/tools/link.py +++ b/tools/link.py @@ -449,9 +449,7 @@ def check_human_readable_list(items): def make_js_executable(script): src = read_file(script) cmd = config.NODE_JS - if settings.MEMORY64 == 1: - cmd += shared.node_memory64_flags() - elif settings.WASM_BIGINT: + if settings.WASM_BIGINT: cmd += shared.node_bigint_flags(config.NODE_JS) if len(cmd) > 1 or not os.path.isabs(cmd[0]): # Using -S (--split-string) here means that arguments to the executable are diff --git a/tools/shared.py b/tools/shared.py index c6eb79378495e..9ccd2354f83e1 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -394,10 +394,6 @@ def node_reference_types_flags(nodejs): return [] -def node_memory64_flags(): - return ['--experimental-wasm-memory64'] - - def node_exception_flags(nodejs): node_version = get_node_version(nodejs) # Exception handling was enabled by default in node v17.