corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1781425 - wasm: Remove baldrdash. r=jseward,supply-chain-reviewers

Browse Source 
The baldrdash integration of Cranelift is agreed between SM and CL
to be the wrong shape. Our import of the code base is also old and
causes difficulties for us when upgrading some crates (see bug
1774829). We should remove it for now to unblock bug 1774829.

Differential Revision: https://phabricator.services.mozilla.com/D152806
This commit is contained in:
Ryan Hunt
2022-07-27 22:30:17 +00:00
parent 06ddbd2b65
commit 9865684fd5
469 changed files with 65 additions and 265841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
js/src/shell/js.cpp
View File

@@ -11056,21 +11056,12 @@ static bool SetContextOptions(JSContext* cx, const OptionParser& op) {
strcmp(str, "baseline+optimized") == 0) {
MOZ_ASSERT(enableWasmBaseline);
MOZ_ASSERT(enableWasmOptimizing);
#ifdef ENABLE_WASM_CRANELIFT
} else if (strcmp(str, "cranelift") == 0) {
enableWasmBaseline = false;
enableWasmOptimizing = true;
} else if (strcmp(str, "baseline+cranelift") == 0) {
MOZ_ASSERT(enableWasmBaseline);
enableWasmOptimizing = true;
#else
} else if (strcmp(str, "ion") == 0) {
enableWasmBaseline = false;
enableWasmOptimizing = true;
} else if (strcmp(str, "baseline+ion") == 0) {
MOZ_ASSERT(enableWasmBaseline);
enableWasmOptimizing = true;
#endif
} else {
return OptionFailure("wasm-compiler", str);
}
@@ -11117,13 +11108,7 @@ static bool SetContextOptions(JSContext* cx, const OptionParser& op) {
.setWasm(enableWasm)
.setWasmForTrustedPrinciples(enableWasm)
.setWasmBaseline(enableWasmBaseline)
#if defined(ENABLE_WASM_CRANELIFT)
.setWasmCranelift(enableWasmOptimizing)
.setWasmIon(false)
#else
.setWasmCranelift(false)
.setWasmIon(enableWasmOptimizing)
#endif
#define WASM_FEATURE(NAME, ...) .setWasm##NAME(enableWasm##NAME)
JS_FOR_WASM_FEATURES(WASM_FEATURE, WASM_FEATURE, WASM_FEATURE)
@@ -11524,13 +11509,7 @@ static void SetWorkerContextOptions(JSContext* cx) {
.setAsmJS(enableAsmJS)
.setWasm(enableWasm)
.setWasmBaseline(enableWasmBaseline)
#if defined(ENABLE_WASM_CRANELIFT)
.setWasmCranelift(enableWasmOptimizing)
.setWasmIon(false)
#else
.setWasmCranelift(false)
.setWasmIon(enableWasmOptimizing)
#endif
#define WASM_FEATURE(NAME, ...) .setWasm##NAME(enableWasm##NAME)
JS_FOR_WASM_FEATURES(WASM_FEATURE, WASM_FEATURE, WASM_FEATURE)
#undef WASM_FEATURE
@@ -12056,13 +12035,8 @@ int main(int argc, char** argv) {
!op.addStringOption(
'\0', "wasm-compiler", "[option]",
"Choose to enable a subset of the wasm compilers, valid options are "
"'none', 'baseline', 'ion', 'cranelift', 'optimizing', "
"'baseline+ion', "
"'baseline+cranelift', 'baseline+optimizing'. Choosing 'ion' when "
"Ion is "
"not available or 'cranelift' when Cranelift is not available will "
"fail; "
"use 'optimizing' for cross-compiler compatibility.") ||
"'none', 'baseline', 'ion', 'optimizing', "
"'baseline+ion', 'baseline+optimizing'.") ||
!op.addBoolOption('\0', "wasm-verbose",
"Enable WebAssembly verbose logging") ||
!op.addBoolOption('\0', "disable-wasm-huge-memory",
@@ -12844,9 +12818,8 @@ int main(int argc, char** argv) {
static char buf[n_avail];
// `n_needed` depends on the compiler name specified. However, it can't
// be arbitrarily long, since previous flag-checking should have limited
// it to a set of known possibilities: "baseline", "ion", "cranelift",
// "baseline+ion", "baseline+cranelift", etc. Still, assert this for
// safety.
// it to a set of known possibilities: "baseline", "ion",
// "baseline+ion", Still, assert this for safety.
MOZ_RELEASE_ASSERT(n_needed < n_avail);
memset(buf, 0, sizeof(buf));
SprintfBuf(buf, n_avail, "--%s=%s", "wasm-compiler", wasm_compiler);