1699398 - Fix build failures resulting in "use of undeclared identifier 'forceWasmIon'" in obscure build configurations

Status: RESOLVED FIXED

(Core :: JavaScript: WebAssembly, defect)

Description

[Julian Seward [:jseward]]

Following the landing of wasm-via-Ion on arm64 (bug 1678097), some obscure
build configurations now break the build due to incorrect target-selection
ifdeffery. This has been observed to happen for x86_64-linux when the following
are specified together:

ac_add_options --enable-cranelift
ac_add_options --enable-js-shell

Comment 1

[Julian Seward [:jseward]]

Attachment: Bug 1699398 - Fix build failures resulting in "use of undeclared identifier 'forceWasmIon'" in obscure build configurations. r=lth.

Following the landing of wasm-via-Ion on arm64 (bug 1678097), some obscure
build configurations now break the build due to incorrect target-selection
ifdeffery. This has been observed to happen for x86_64-linux when the
following are specified together (in a browser build):

ac_add_options --enable-cranelift
ac_add_options --enable-js-shell

In particular, forceWasmIon is declared in js.cpp and is guarded by
JS_CODEGEN_ARM64. But there were later some uses of it guarded by
ENABLE_WASM_CRANELIFT. In effect this incorrectly assumes that
JS_CODEGEN_ARM64 and ENABLE_WASM_CRANELIFT are both either defined or
undefined. But that's not correct, (eg) for a build on x86_64-linux that is
configured --enable-cranelift.

This patch fixes that by guarding such use points additionally with
JS_CODEGEN_ARM64, so as to ensure the sets of configurations that read or
write forceWasmIon are a subset of the configurations that declare it.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/7d90e800cbd0
Fix build failures resulting in "use of undeclared identifier 'forceWasmIon'" in obscure build configurations.  r=lth.

Comment 3

[Atila Butkovits]

https://hg.mozilla.org/mozilla-central/rev/7d90e800cbd0