From c07cacf0adaecb996be91903cd87f2722c8a152e Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 30 Jul 2021 12:03:52 +0000 Subject: [PATCH] Bug 1720828 - Switch wasm sandboxing Linux x64 and Mac x64 builds from lucet to wasm2c. r=shravanrn,firefox-build-system-reviewers,andi Still allow to explicitly opt-in lucetc with a non-empty LUCETC value. Differential Revision: https://phabricator.services.mozilla.com/D120668 --- taskcluster/ci/build/linux.yml | 36 ------------------- taskcluster/ci/build/macosx.yml | 1 - taskcluster/ci/hazard/kind.yml | 1 - taskcluster/ci/instrumented-build/kind.yml | 2 -- taskcluster/ci/searchfox/kind.yml | 2 -- taskcluster/ci/source-test/coverity.yml | 1 - .../ci/static-analysis-autotest/kind.yml | 1 - taskcluster/ci/valgrind/kind.yml | 1 - toolkit/moz.configure | 6 +--- 9 files changed, 1 insertion(+), 50 deletions(-) diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml index fb5785a747b1..c0112b682a1b 100644 --- a/taskcluster/ci/build/linux.yml +++ b/taskcluster/ci/build/linux.yml @@ -45,7 +45,6 @@ linux64/opt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -129,7 +128,6 @@ linux64-gcc/opt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -217,7 +215,6 @@ linux64-fuzzing/debug: - linux64-rust-size - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot optimization: @@ -265,7 +262,6 @@ linux64-fuzzing-noopt/debug: - linux64-rust-size - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot optimization: @@ -314,7 +310,6 @@ linux64/debug: - linux64-rust-size - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -366,7 +361,6 @@ linux64/codeql-cpp: - linux64-rust-size - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot notifications: @@ -469,7 +463,6 @@ linux64-devedition/opt: - linux64-dump_syms - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -512,7 +505,6 @@ linux/opt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-i686-linux-gnu - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -557,7 +549,6 @@ linux/debug: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-i686-linux-gnu - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -600,7 +591,6 @@ linux-rusttests/opt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-i686-linux-gnu - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -645,7 +635,6 @@ linux-rusttests/debug: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-i686-linux-gnu - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -697,7 +686,6 @@ linux-devedition/opt: - linux64-dump_syms - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-i686-linux-gnu - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -744,7 +732,6 @@ linux-shippable/opt: - linux64-dump_syms - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-i686-linux-gnu - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -789,7 +776,6 @@ linux-reproduced/opt: - linux64-dump_syms - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-i686-linux-gnu - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -834,7 +820,6 @@ linux64-reproduced/opt: - linux64-dump_syms - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -877,7 +862,6 @@ linux64-asan/opt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -920,7 +904,6 @@ linux64-tsan/opt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -966,7 +949,6 @@ linux64-tsan-fuzzing/opt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot optimization: @@ -1014,7 +996,6 @@ linux64-asan-fuzzing/noopt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot optimization: @@ -1062,7 +1043,6 @@ linux64-asan-fuzzing/opt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot optimization: @@ -1110,7 +1090,6 @@ linux64-asan-fuzzing-ccov/opt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -1153,7 +1132,6 @@ linux64-fuzzing-ccov/opt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot optimization: @@ -1209,7 +1187,6 @@ linux64-asan-reporter-shippable/opt: - linux64-llvm-symbolizer - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -1251,7 +1228,6 @@ linux64-asan/debug: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot optimization: @@ -1303,7 +1279,6 @@ linux64-shippable/opt: - linux64-dump_syms - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -1347,7 +1322,6 @@ linux64-noopt/debug: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -1389,7 +1363,6 @@ linux64-rusttests/opt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot optimization: @@ -1433,7 +1406,6 @@ linux64-rusttests/debug: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot optimization: @@ -1483,7 +1455,6 @@ linux64-ccov/opt: - linux64-nasm - linux64-node - linux64-grcov - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -1526,7 +1497,6 @@ linux64-ccov/debug: - linux64-nasm - linux64-node - linux64-grcov - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -1567,7 +1537,6 @@ linux64-add-on-devel/opt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -1610,7 +1579,6 @@ linux64-aarch64/opt: - linux64-dump_syms - linux64-sccache - linux64-node - - linux64-lucetc - sysroot-aarch64-linux-gnu - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -1658,7 +1626,6 @@ linux-gcp/debug: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-i686-linux-gnu - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -1704,7 +1671,6 @@ linux-gcp/opt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-i686-linux-gnu - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -1749,7 +1715,6 @@ linux64-gcp/debug: - linux64-rust-size - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot optimization: @@ -1794,6 +1759,5 @@ linux64-gcp/opt: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot diff --git a/taskcluster/ci/build/macosx.yml b/taskcluster/ci/build/macosx.yml index cd571f22f3d2..11e6d04441b3 100644 --- a/taskcluster/ci/build/macosx.yml +++ b/taskcluster/ci/build/macosx.yml @@ -25,7 +25,6 @@ job-defaults: - linux64-cbindgen - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu macosx64/debug: diff --git a/taskcluster/ci/hazard/kind.yml b/taskcluster/ci/hazard/kind.yml index b0728ba15986..32eeed634e9e 100644 --- a/taskcluster/ci/hazard/kind.yml +++ b/taskcluster/ci/hazard/kind.yml @@ -74,7 +74,6 @@ jobs: - linux64-cbindgen - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot optimization: diff --git a/taskcluster/ci/instrumented-build/kind.yml b/taskcluster/ci/instrumented-build/kind.yml index 842e8e917609..06d1653c66e2 100644 --- a/taskcluster/ci/instrumented-build/kind.yml +++ b/taskcluster/ci/instrumented-build/kind.yml @@ -93,7 +93,6 @@ jobs: - linux64-dump_syms - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -132,7 +131,6 @@ jobs: - linux64-dump_syms - linux64-nasm - linux64-node - - linux64-lucetc - macosx64-sdk-10.12 - sysroot-x86_64-linux-gnu - wasi-sysroot diff --git a/taskcluster/ci/searchfox/kind.yml b/taskcluster/ci/searchfox/kind.yml index a45336b5985c..a3c390dc79c3 100644 --- a/taskcluster/ci/searchfox/kind.yml +++ b/taskcluster/ci/searchfox/kind.yml @@ -57,7 +57,6 @@ jobs: - linux64-rust - linux64-cbindgen - linux64-dump_syms - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot @@ -98,7 +97,6 @@ jobs: - linux64-rust-macos - linux64-cbindgen - linux64-dump_syms - - linux64-lucetc - macosx64-sdk-10.12 - sysroot-x86_64-linux-gnu - wasi-sysroot diff --git a/taskcluster/ci/source-test/coverity.yml b/taskcluster/ci/source-test/coverity.yml index 7777b9be73bd..d5824787b8a4 100644 --- a/taskcluster/ci/source-test/coverity.yml +++ b/taskcluster/ci/source-test/coverity.yml @@ -24,7 +24,6 @@ job-defaults: - linux64-cbindgen - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot when: diff --git a/taskcluster/ci/static-analysis-autotest/kind.yml b/taskcluster/ci/static-analysis-autotest/kind.yml index 8afc906b1bc6..1d152ef81917 100644 --- a/taskcluster/ci/static-analysis-autotest/kind.yml +++ b/taskcluster/ci/static-analysis-autotest/kind.yml @@ -65,7 +65,6 @@ jobs: - linux64-cbindgen - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot diff --git a/taskcluster/ci/valgrind/kind.yml b/taskcluster/ci/valgrind/kind.yml index ea35d9c6a3b0..a2de9abb584d 100644 --- a/taskcluster/ci/valgrind/kind.yml +++ b/taskcluster/ci/valgrind/kind.yml @@ -58,7 +58,6 @@ jobs: - linux64-sccache - linux64-nasm - linux64-node - - linux64-lucetc - sysroot-x86_64-linux-gnu - wasi-sysroot optimization: diff --git a/toolkit/moz.configure b/toolkit/moz.configure index 04741ab3fb5f..1f9593e59c7a 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -2092,13 +2092,9 @@ with only_when(requires_wasm_sandboxing & compile_environment): def lucetc(value): return value - # Allow setting LUCETC to an explicit empty value to force building - # with wasm2c. @depends("LUCETC") def lucetc_not_empty(lucetc): - if lucetc.origin != "default" and not lucetc: - return False - return True + return bool(lucetc) lucetc = check_prog( "LUCETC", ["lucetc"], input=lucetc, bootstrap="lucetc", when=lucetc_not_empty