A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Remove shared-everything-threads flags/gates (#15265)
Alex Crichton1d4f64d4ca7c
diff --git a/crates/cli-flags/src/lib.rs b/crates/cli-flags/src/lib.rsindex 525623cc8e..8b500f7261 100644--- a/crates/cli-flags/src/lib.rs+++ b/crates/cli-flags/src/lib.rs@@ -486,8 +486,6 @@ wasmtime_option_group! {pub threads: Option<bool>,/// Configure the ability to create a `shared` memory.pub shared_memory: Option<bool>,- /// Configure support for the shared-everything-threads proposal.- pub shared_everything_threads: Option<bool>,/// Configure support for the memory64 proposal.pub memory64: Option<bool>,/// Configure support for the component-model proposal.@@ -859,11 +857,6 @@ static WASM_FEATURE_OPTIONS: &[(WasmFeatures, fn(&WasmOptions) -> Option<bool>,(F::COMPACT_IMPORTS, |w| w.compact_imports, None),(F::EXTENDED_CONST, |w| w.extended_const, None),(F::THREADS, |w| w.threads, None),- (- F::SHARED_EVERYTHING_THREADS,- |w| w.shared_everything_threads,- None,- ),(F::GC, |w| w.gc, None),(F::GC_TYPES, |w| w.gc_support, Some("gc-support")),(F::REFERENCE_TYPES, |w| w.reference_types, None),@@ -1735,9 +1728,6 @@ impl CommonOptions {multi_value: Some(features.contains(WasmFeatures::MULTI_VALUE)),reference_types: Some(features.contains(WasmFeatures::REFERENCE_TYPES)),relaxed_simd: Some(features.contains(WasmFeatures::RELAXED_SIMD)),- shared_everything_threads: Some(- features.contains(WasmFeatures::SHARED_EVERYTHING_THREADS),- ),simd: Some(features.contains(WasmFeatures::SIMD)),stack_switching: Some(features.contains(WasmFeatures::STACK_SWITCHING)),tail_call: Some(features.contains(WasmFeatures::TAIL_CALL)),diff --git a/crates/fuzzing/src/generators/config.rs b/crates/fuzzing/src/generators/config.rsindex dba59aaecc..aede6b83c5 100644--- a/crates/fuzzing/src/generators/config.rs+++ b/crates/fuzzing/src/generators/config.rs@@ -280,8 +280,6 @@ impl Config {cfg.wasm.simd = Some(self.module_config.config.simd_enabled);cfg.wasm.tail_call = Some(self.module_config.config.tail_call_enabled);cfg.wasm.threads = Some(self.module_config.config.threads_enabled);- cfg.wasm.shared_everything_threads =- Some(self.module_config.config.shared_everything_threads_enabled);cfg.wasm.wide_arithmetic = Some(self.module_config.config.wide_arithmetic_enabled);cfg.wasm.branch_hinting = Some(self.wasmtime.branch_hinting);cfg.wasm.exceptions = Some(self.module_config.config.exceptions_enabled);diff --git a/crates/test-util/src/wasmtime_wast.rs b/crates/test-util/src/wasmtime_wast.rsindex 4fb59b87eb..10749cfe7a 100644--- a/crates/test-util/src/wasmtime_wast.rs+++ b/crates/test-util/src/wasmtime_wast.rs@@ -64,7 +64,6 @@ impl TestConfig {custom_page_sizes,multi_memory,threads,- shared_everything_threads,gc,function_references,relaxed_simd,@@ -117,7 +116,6 @@ impl TestConfig {w.custom_page_sizes = Some(on(custom_page_sizes));w.multi_memory = Some(on(multi_memory));w.threads = Some(on(threads));- w.shared_everything_threads = Some(on(shared_everything_threads));w.gc = Some(gc);w.function_references = Some(function_references);w.relaxed_simd = Some(relaxed_simd);diff --git a/crates/test-util/src/wast.rs b/crates/test-util/src/wast.rsindex 52e95896a6..9b37254219 100644--- a/crates/test-util/src/wast.rs+++ b/crates/test-util/src/wast.rs@@ -347,7 +347,6 @@ macro_rules! foreach_config_option {custom_page_sizesmulti_memorythreads- shared_everything_threadsgcfunction_referencesrelaxed_simddiff --git a/crates/wasmtime/src/config.rs b/crates/wasmtime/src/config.rsindex 098bc8df1f..ff614a5330 100644--- a/crates/wasmtime/src/config.rs+++ b/crates/wasmtime/src/config.rs@@ -1127,21 +1127,6 @@ impl Config {self}- /// Configures whether the WebAssembly [shared-everything-threads] proposal- /// will be enabled for compilation.- ///- /// This feature gates extended use of the `shared` attribute on items other- /// than memories, extra atomic instructions, and new component model- /// intrinsics for spawning threads. It depends on the- /// [`wasm_threads`][Self::wasm_threads] being enabled.- ///- /// [shared-everything-threads]:- /// https://github.com/webassembly/shared-everything-threads- pub fn wasm_shared_everything_threads(&mut self, enable: bool) -> &mut Self {- self.wasm_features(WasmFeatures::SHARED_EVERYTHING_THREADS, enable);- self- }-/// Configures whether the [WebAssembly reference types proposal][proposal]/// will be enabled for compilation.///@@ -2574,7 +2559,6 @@ impl Config {// of features we _definitely can't support_ because wasmtime// has never heard of them.let features_known_to_wasmtime = WasmFeatures::WASM3- | WasmFeatures::SHARED_EVERYTHING_THREADS| WasmFeatures::COMPONENT_MODEL| WasmFeatures::CUSTOM_PAGE_SIZES| WasmFeatures::COMPACT_IMPORTSdiff --git a/tests/misc_testsuite/fuel/costs.wast b/tests/misc_testsuite/fuel/costs.wastindex 87af64b1b5..67e62facc5 100644--- a/tests/misc_testsuite/fuel/costs.wast+++ b/tests/misc_testsuite/fuel/costs.wast@@ -1,7 +1,9 @@;;! bulk_memory = true;;! reference_types = true;;! exceptions = true-;;! flags = "-W fuel=1000000000"+;;! # Force table-lazy-init on to avoid fuzzing turning it off in order to keep+;;! # fuel costs deterministic below.+;;! flags = "-W fuel=1000000000 -O table-lazy-init";; Each test sets the store's fuel to 1000, instantiates a module (usually;; running its start function), and checks exactly how much fuel is left.diff --git a/tests/misc_testsuite/shared-everything-threads/flags.wast b/tests/misc_testsuite/shared-everything-threads/flags.wastdeleted file mode 100644index 6e580f128f..0000000000--- a/tests/misc_testsuite/shared-everything-threads/flags.wast+++ /dev/null@@ -1,3 +0,0 @@-;;! shared_everything_threads = true--(module)