Skip to content

Commit

Permalink
[test] Remove node/v8 memory64 flags. NFC
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
sbc100 committed Jan 6, 2025
1 parent f9a451a commit d9c1c0d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions test/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 1 addition & 3 deletions tools/link.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions tools/shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit d9c1c0d

Please sign in to comment.