A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Winch exceptions and gc types are not yet Tier 1 supported (#14449)
Pat Hickeyc21f5ede5d37
diff --git a/crates/fuzzing/src/generators/config.rs b/crates/fuzzing/src/generators/config.rsindex 3ed85022f7..cd0630b4b9 100644--- a/crates/fuzzing/src/generators/config.rs+++ b/crates/fuzzing/src/generators/config.rs@@ -364,6 +364,10 @@ impl Config {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);+ // Winch disables GC types by default, but we want to fuzz it+ if self.wasmtime.compiler_strategy == CompilerStrategy::Winch {+ cfg.wasm.gc_support = Some(true);+ }cfg.wasm.stack_switching = Some(self.module_config.stack_switching);cfg.wasm.shared_memory = Some(self.module_config.shared_memory);if !self.module_config.config.simd_enabled {diff --git a/crates/test-util/src/wasmtime_wast.rs b/crates/test-util/src/wasmtime_wast.rsindex 8a2cf70d1b..b34099eaac 100644--- a/crates/test-util/src/wasmtime_wast.rs+++ b/crates/test-util/src/wasmtime_wast.rs@@ -58,9 +58,9 @@ pub fn apply_test_config(config: &mut Config, test_config: &wast::TestConfig) {legacy_exceptions,stack_switching,custom_descriptors,+ gc_types,hogs_memory: _,- gc_types: _,spec_test: _,} = *test_config;// Note that all of these proposals/features are currently default-off to@@ -105,6 +105,7 @@ pub fn apply_test_config(config: &mut Config, test_config: &wast::TestConfig) {let simd = relaxed_simd || simd.unwrap_or(false);let exceptions = stack_switching || exceptions.unwrap_or(false);+ let gc_types = gc || exceptions || reference_types || gc_types.unwrap_or(false);// Not implemented in Wasmtime yet.let _custom_descriptors = custom_descriptors.unwrap_or(false);@@ -139,6 +140,7 @@ pub fn apply_test_config(config: &mut Config, test_config: &wast::TestConfig) {.wasm_component_model_canonical_names(component_model_canonical_names).wasm_exceptions(exceptions).wasm_stack_switching(stack_switching)+ .gc_support(gc_types).cranelift_nan_canonicalization(nan_canonicalization);#[expect(deprecated, reason = "forwarding legacy-exceptions")]config.wasm_legacy_exceptions(legacy_exceptions);diff --git a/crates/wasmtime/src/config.rs b/crates/wasmtime/src/config.rsindex edbc23a666..98726d426c 100644--- a/crates/wasmtime/src/config.rs+++ b/crates/wasmtime/src/config.rs@@ -1432,7 +1432,8 @@ impl Config {/// Configures whether the [Exception-handling proposal][proposal] is enabled or not.///- /// This is `true` by default.+ /// This is `true` by default, except when using [`Strategy::Winch`] where+ /// it defaults to `false`.////// [proposal]: https://github.com/WebAssembly/exception-handling#[cfg(feature = "gc")]@@ -2603,6 +2604,13 @@ impl Config {// supports one particular platform and not others. Things like that.features = features & !self.compiler_panicking_wasm_features();+ // Winch can compile GC types (e.g. `externref`) but they're not enabled+ // by default. Exceptions require a GC heap, so they're disabled too.+ #[cfg(any(feature = "cranelift", feature = "winch"))]+ if self.compiler_config.as_ref().and_then(|c| c.strategy) == Some(Strategy::Winch) {+ features.remove(WasmFeatures::GC_TYPES | WasmFeatures::EXCEPTIONS);+ }+// And, finally, process all explicitly enabled/disabled features on// behalf of the embedder's frobbing `Config::wasm_*`. These have the// highest priority since they were explicitly requested.@@ -3276,7 +3284,8 @@ impl Config {/// be enabled without also having this option enabled.////// This option defaults to whether the crate `gc` feature is enabled or- /// not.+ /// not, except when using [`Strategy::Winch`] where it defaults to+ /// `false`.pub fn gc_support(&mut self, enable: bool) -> &mut Self {self.wasm_features(WasmFeatures::GC_TYPES, enable)}diff --git a/docs/stability-tiers.md b/docs/stability-tiers.mdindex cb8fb2f869..69d6a4098a 100644--- a/docs/stability-tiers.md+++ b/docs/stability-tiers.md@@ -77,7 +77,9 @@ For explanations of what each tier means see below.[^support]: Compiler support is further broken down [below](#compiler-support)into finer-grained target/wasm proposal combinations. Compilers are not- required to support the full matrix of all tier 1 targets/proposals.+ required to support the full matrix of all tier 1 targets/proposals, and not+ all wasm proposals which have support in a compiler are mature enough to be+ enabled by default and therefore supported as tier 1.#### Tier 2@@ -203,8 +205,9 @@ refined in the below table in their support for various architectures andWebAssembly features. Tier 1 WebAssembly feature are required to be supported byat least one compiler on all Tier 1 targets, and similarly for Tier 2 featuresand so on. Note that architecture here is independent of OS, meaning that-support is uniform across Wasmtime's supported target for each tier. The legend-here is:+support is uniform across Wasmtime's supported target for each tier. Not all+wasm proposals which have support in a compiler are mature enough to be enabled+by default and therefore supported as tier 1. The legend here is:* β - fully supported* π§ - work-in-progressdiff --git a/docs/stability-wasm-proposals.md b/docs/stability-wasm-proposals.mdindex 08ec63b040..bca2aeb5f7 100644--- a/docs/stability-wasm-proposals.md+++ b/docs/stability-wasm-proposals.md@@ -24,18 +24,18 @@ The emoji legend is:| [`nontrapping-fptoint`] | β | β | β | β | β | β || [`multi-value`] | β | β | β | β | β | β || [`bulk-memory`] | β | β | β | β | β | β |-| [`reference-types`] | β | β | β | β | β | β |+| [`reference-types`] | β | β | β [^4] | β | β | β || [`simd`] | β | β | β | β | β | β || [`component-model`] | β[^1] | β | β | π§[^2] | β | π§[^3]|-| [`relaxed-simd`] | β | β | β | β | β | β |+| [`relaxed-simd`] | β | β | β [^4] | β | β | β || [`multi-memory`] | β | β | β | β | β | β |-| [`tail-call`] | β | β | β | β | β | β |+| [`tail-call`] | β | β | β [^4] | β | β | β || [`extended-const`] | β | β | β | β | β | β || [`memory64`] | β | β | β | β | β | β |-| [`function-references`] | β | β | β | β | β | β |-| [`gc`] | β | β | β | β | β | β |-| [`exception-handling`] | β | β | β | β | β | β |-| [`wide-arithmetic`] | β | β | β | β | β | β |+| [`function-references`] | β | β | β [^4] | β | β | β |+| [`gc`] | β | β | β [^4] | β | β | β |+| [`exception-handling`] | β | β | β [^4] | β | β | β |+| [`wide-arithmetic`] | β | β | β [^4] | β | β | β |[^1]: The `component-model` proposal is not at phase 4 in the standardizationprocess but it is still enabled-by-default in Wasmtime.@@ -43,6 +43,7 @@ The emoji legend is:lines of `wasm-smith` are not implemented for components.[^3]: The component model is mostly supported in the C API but [gapsremain][cm-capi-gaps].+[^4]: Winch does not yet support this proposal at Tier 1.[cm-capi-gaps]: https://github.com/bytecodealliance/wasmtime/issues?q=is%3Aissue%20state%3Aopen%20label%3Awasm-proposal%3Acomponent-model%20label%3Awasmtime%3Ac-apidiff --git a/tests/all/gc.rs b/tests/all/gc.rsindex 944630d582..3061f578cf 100644--- a/tests/all/gc.rs+++ b/tests/all/gc.rs@@ -3796,6 +3796,7 @@ fn initial_size_larger_than_reservation() -> Result<()> {fn winch_externref_survives_gc_in_frame() -> Result<()> {for collector in [Collector::Null, Collector::Copying] {let mut config = Config::new();+ config.gc_support(true);config.strategy(Strategy::Winch);config.collector(collector);let Ok(engine) = Engine::new(&config) else {@@ -3845,6 +3846,7 @@ fn winch_externref_survives_gc_in_frame() -> Result<()> {#[cfg_attr(miri, ignore)]fn winch_drc_write_barrier_drops_old_global_value() -> Result<()> {let mut config = Config::new();+ config.gc_support(true);config.strategy(Strategy::Winch);config.collector(Collector::DeferredReferenceCounting);let Ok(engine) = Engine::new(&config) else {@@ -3890,6 +3892,7 @@ fn winch_drc_write_barrier_drops_old_global_value() -> Result<()> {#[cfg_attr(miri, ignore)]fn winch_drc_read_barrier_keeps_loaded_ref_alive() -> Result<()> {let mut config = Config::new();+ config.gc_support(true);config.strategy(Strategy::Winch);config.collector(Collector::DeferredReferenceCounting);let Ok(engine) = Engine::new(&config) else {@@ -3945,6 +3948,7 @@ fn winch_drc_read_barrier_keeps_loaded_ref_alive() -> Result<()> {#[cfg_attr(miri, ignore)]fn winch_drc_i31_wrapped_as_externref_skips_global_barriers() -> Result<()> {let mut config = Config::new();+ config.gc_support(true);config.strategy(Strategy::Winch);config.collector(Collector::DeferredReferenceCounting);let Ok(engine) = Engine::new(&config) else {@@ -3992,6 +3996,7 @@ fn winch_drc_i31_wrapped_as_externref_skips_global_barriers() -> Result<()> {#[cfg_attr(miri, ignore)]fn winch_drc_read_barrier_forces_gc_at_threshold() -> Result<()> {let mut config = Config::new();+ config.gc_support(true);config.strategy(Strategy::Winch);config.collector(Collector::DeferredReferenceCounting);let Ok(engine) = Engine::new(&config) else {@@ -4070,6 +4075,7 @@ fn winch_ref_params_and_results_across_gc() -> Result<()> {);for collector in [Collector::Null, Collector::Copying] {let mut config = Config::new();+ config.gc_support(true);config.strategy(Strategy::Winch);config.collector(collector);let Ok(engine) = Engine::new(&config) else {diff --git a/tests/disas/winch/aarch64/exceptions/catch-ref-drc.wat b/tests/disas/winch/aarch64/exceptions/catch-ref-drc.watindex 0c53fd53e4..4fd56767aa 100644--- a/tests/disas/winch/aarch64/exceptions/catch-ref-drc.wat+++ b/tests/disas/winch/aarch64/exceptions/catch-ref-drc.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-W exceptions -C collector=drc"+;;! flags = "-W exceptions,gc-support -C collector=drc";; A `catch_ref` landing pad preserves the exception reference while the DRC;; read barrier loads an `externref` payload.diff --git a/tests/disas/winch/aarch64/exceptions/catch-ref-null.wat b/tests/disas/winch/aarch64/exceptions/catch-ref-null.watindex 96b17173b3..bb10a643ce 100644--- a/tests/disas/winch/aarch64/exceptions/catch-ref-null.wat+++ b/tests/disas/winch/aarch64/exceptions/catch-ref-null.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-W exceptions -C collector=null"+;;! flags = "-W exceptions,gc-support -C collector=null";; A `catch_ref` landing pad appends the exception reference after the tag's;; payload fields before branching to its target.diff --git a/tests/disas/winch/aarch64/exceptions/catch-ref.wat b/tests/disas/winch/aarch64/exceptions/catch-ref.watindex fbd9b12f9f..d8c26b81a1 100644--- a/tests/disas/winch/aarch64/exceptions/catch-ref.wat+++ b/tests/disas/winch/aarch64/exceptions/catch-ref.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-W exceptions -C collector=copying"+;;! flags = "-W exceptions,gc-support -C collector=copying";; A `catch_ref` landing pad appends the exception reference after the tag's;; payload fields before branching to its target.diff --git a/tests/disas/winch/aarch64/exceptions/landing-pads.wat b/tests/disas/winch/aarch64/exceptions/landing-pads.watindex 8095eeb2d2..15d9d67003 100644--- a/tests/disas/winch/aarch64/exceptions/landing-pads.wat+++ b/tests/disas/winch/aarch64/exceptions/landing-pads.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-W exceptions -C collector=null"+;;! flags = "-W exceptions,gc-support -C collector=null";; A call with tagged and default handlers records both landing pads.(modulediff --git a/tests/disas/winch/aarch64/exceptions/throw-drc.wat b/tests/disas/winch/aarch64/exceptions/throw-drc.watindex af1cf92d9e..dc6103f0b5 100644--- a/tests/disas/winch/aarch64/exceptions/throw-drc.wat+++ b/tests/disas/winch/aarch64/exceptions/throw-drc.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-W exceptions -C collector=drc"+;;! flags = "-W exceptions,gc-support -C collector=drc";; Calls made while the `try_table` handler is active carry exception metadata.;; Its landing pad loads the exception's payload and branches to `$h`.diff --git a/tests/disas/winch/aarch64/exceptions/throw-externref-drc.wat b/tests/disas/winch/aarch64/exceptions/throw-externref-drc.watindex 7a5af0e414..a6c1e834e4 100644--- a/tests/disas/winch/aarch64/exceptions/throw-externref-drc.wat+++ b/tests/disas/winch/aarch64/exceptions/throw-externref-drc.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-W exceptions -C collector=drc"+;;! flags = "-W exceptions,gc-support -C collector=drc";; Store an external reference in an exception payload.(modulediff --git a/tests/disas/winch/aarch64/exceptions/throw-externref-null.wat b/tests/disas/winch/aarch64/exceptions/throw-externref-null.watindex 739b45f928..eb9652c675 100644--- a/tests/disas/winch/aarch64/exceptions/throw-externref-null.wat+++ b/tests/disas/winch/aarch64/exceptions/throw-externref-null.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-W exceptions -C collector=null"+;;! flags = "-W exceptions,gc-support -C collector=null";; Store an external reference in an exception payload.(modulediff --git a/tests/disas/winch/aarch64/exceptions/throw-externref.wat b/tests/disas/winch/aarch64/exceptions/throw-externref.watindex 89008923b3..2235d2ce8f 100644--- a/tests/disas/winch/aarch64/exceptions/throw-externref.wat+++ b/tests/disas/winch/aarch64/exceptions/throw-externref.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-W exceptions -C collector=copying"+;;! flags = "-W exceptions,gc-support -C collector=copying";; Store an external reference in an exception payload.(modulediff --git a/tests/disas/winch/aarch64/exceptions/throw-funcref-drc.wat b/tests/disas/winch/aarch64/exceptions/throw-funcref-drc.watindex 311a6314ff..f9097a75e1 100644--- a/tests/disas/winch/aarch64/exceptions/throw-funcref-drc.wat+++ b/tests/disas/winch/aarch64/exceptions/throw-funcref-drc.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-W exceptions -C collector=drc"+;;! flags = "-W exceptions,gc-support -C collector=drc";; A function reference is interned before it is stored in the exception.(modulediff --git a/tests/disas/winch/aarch64/exceptions/throw-funcref-null.wat b/tests/disas/winch/aarch64/exceptions/throw-funcref-null.watindex f20ac0bfe5..f62204c77f 100644--- a/tests/disas/winch/aarch64/exceptions/throw-funcref-null.wat+++ b/tests/disas/winch/aarch64/exceptions/throw-funcref-null.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-W exceptions -C collector=null"+;;! flags = "-W exceptions,gc-support -C collector=null";; A function reference is interned before it is stored in the exception.(modulediff --git a/tests/disas/winch/aarch64/exceptions/throw-funcref.wat b/tests/disas/winch/aarch64/exceptions/throw-funcref.watindex 25c598d2c4..0cbb51c36c 100644--- a/tests/disas/winch/aarch64/exceptions/throw-funcref.wat+++ b/tests/disas/winch/aarch64/exceptions/throw-funcref.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-W exceptions -C collector=copying"+;;! flags = "-W exceptions,gc-support -C collector=copying";; A function reference is interned before it is stored in the exception.(modulediff --git a/tests/disas/winch/aarch64/exceptions/throw-null.wat b/tests/disas/winch/aarch64/exceptions/throw-null.watindex a3a10b9c56..d9e36d46ef 100644--- a/tests/disas/winch/aarch64/exceptions/throw-null.wat+++ b/tests/disas/winch/aarch64/exceptions/throw-null.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-W exceptions -C collector=null"+;;! flags = "-W exceptions,gc-support -C collector=null";; Calls made while the `try_table` handler is active carry exception metadata.;; Its landing pad loads the exception's payload and branches to `$h`.diff --git a/tests/disas/winch/aarch64/exceptions/throw.wat b/tests/disas/winch/aarch64/exceptions/throw.watindex 30d6f6251b..8f3f76a94d 100644--- a/tests/disas/winch/aarch64/exceptions/throw.wat+++ b/tests/disas/winch/aarch64/exceptions/throw.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-W exceptions -C collector=copying"+;;! flags = "-W exceptions,gc-support -C collector=copying";; Calls made while the `try_table` handler is active carry exception metadata.;; Its landing pad loads the exception's payload and branches to `$h`.diff --git a/tests/disas/winch/aarch64/global-get-externref-drc.wat b/tests/disas/winch/aarch64/global-get-externref-drc.watindex 9ec469e213..22eb456f41 100644--- a/tests/disas/winch/aarch64/global-get-externref-drc.wat+++ b/tests/disas/winch/aarch64/global-get-externref-drc.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-Ccollector=drc"+;;! flags = "-Wgc-support -Ccollector=drc"(module(global $g (mut externref) (ref.null extern))diff --git a/tests/disas/winch/aarch64/global-set-externref-drc.wat b/tests/disas/winch/aarch64/global-set-externref-drc.watindex fe0ef3dd2e..6797be9563 100644--- a/tests/disas/winch/aarch64/global-set-externref-drc.wat+++ b/tests/disas/winch/aarch64/global-set-externref-drc.wat@@ -1,6 +1,6 @@;;! target = "aarch64";;! test = "winch"-;;! flags = "-Ccollector=drc"+;;! flags = "-Wgc-support -Ccollector=drc"(module(global $g (mut externref) (ref.null extern))diff --git a/tests/disas/winch/x64/exceptions/catch-ref-drc.wat b/tests/disas/winch/x64/exceptions/catch-ref-drc.watindex 56e16919e1..e2b9f044ef 100644--- a/tests/disas/winch/x64/exceptions/catch-ref-drc.wat+++ b/tests/disas/winch/x64/exceptions/catch-ref-drc.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-W exceptions -C collector=drc"+;;! flags = "-W exceptions,gc-support -C collector=drc";; A `catch_ref` landing pad preserves the exception reference while the DRC;; read barrier loads an `externref` payload.diff --git a/tests/disas/winch/x64/exceptions/catch-ref-null.wat b/tests/disas/winch/x64/exceptions/catch-ref-null.watindex a28c960df9..79243ed150 100644--- a/tests/disas/winch/x64/exceptions/catch-ref-null.wat+++ b/tests/disas/winch/x64/exceptions/catch-ref-null.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-W exceptions -C collector=null"+;;! flags = "-W exceptions,gc-support -C collector=null";; A `catch_ref` landing pad appends the exception reference after the tag's;; payload fields before branching to its target.diff --git a/tests/disas/winch/x64/exceptions/catch-ref.wat b/tests/disas/winch/x64/exceptions/catch-ref.watindex 78456c188d..ddfad31ab8 100644--- a/tests/disas/winch/x64/exceptions/catch-ref.wat+++ b/tests/disas/winch/x64/exceptions/catch-ref.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-W exceptions -C collector=copying"+;;! flags = "-W exceptions,gc-support -C collector=copying";; A `catch_ref` landing pad appends the exception reference after the tag's;; payload fields before branching to its target.diff --git a/tests/disas/winch/x64/exceptions/landing-pads.wat b/tests/disas/winch/x64/exceptions/landing-pads.watindex 0f35a8705e..795b095ce6 100644--- a/tests/disas/winch/x64/exceptions/landing-pads.wat+++ b/tests/disas/winch/x64/exceptions/landing-pads.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-W exceptions -C collector=null"+;;! flags = "-W exceptions,gc-support -C collector=null";; A call with tagged and default handlers records both landing pads.(modulediff --git a/tests/disas/winch/x64/exceptions/throw-drc.wat b/tests/disas/winch/x64/exceptions/throw-drc.watindex 94a40eb8f9..36a7ceae2e 100644--- a/tests/disas/winch/x64/exceptions/throw-drc.wat+++ b/tests/disas/winch/x64/exceptions/throw-drc.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-W exceptions -C collector=drc"+;;! flags = "-W exceptions,gc-support -C collector=drc";; Calls made while the `try_table` handler is active carry exception metadata.;; Its landing pad loads the exception's payload and branches to `$h`.diff --git a/tests/disas/winch/x64/exceptions/throw-externref-drc.wat b/tests/disas/winch/x64/exceptions/throw-externref-drc.watindex 8cfc9c178f..20dc04175c 100644--- a/tests/disas/winch/x64/exceptions/throw-externref-drc.wat+++ b/tests/disas/winch/x64/exceptions/throw-externref-drc.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-W exceptions -C collector=drc"+;;! flags = "-W exceptions,gc-support -C collector=drc";; Store an external reference in an exception payload.(modulediff --git a/tests/disas/winch/x64/exceptions/throw-externref-null.wat b/tests/disas/winch/x64/exceptions/throw-externref-null.watindex 7755d2a0d8..6186aebf73 100644--- a/tests/disas/winch/x64/exceptions/throw-externref-null.wat+++ b/tests/disas/winch/x64/exceptions/throw-externref-null.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-W exceptions -C collector=null"+;;! flags = "-W exceptions,gc-support -C collector=null";; Store an external reference in an exception payload.(modulediff --git a/tests/disas/winch/x64/exceptions/throw-externref.wat b/tests/disas/winch/x64/exceptions/throw-externref.watindex 8a3a25d65e..a260135e29 100644--- a/tests/disas/winch/x64/exceptions/throw-externref.wat+++ b/tests/disas/winch/x64/exceptions/throw-externref.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-W exceptions -C collector=copying"+;;! flags = "-W exceptions,gc-support -C collector=copying";; Store an external reference in an exception payload.(modulediff --git a/tests/disas/winch/x64/exceptions/throw-funcref-drc.wat b/tests/disas/winch/x64/exceptions/throw-funcref-drc.watindex 790f716b9f..050d971266 100644--- a/tests/disas/winch/x64/exceptions/throw-funcref-drc.wat+++ b/tests/disas/winch/x64/exceptions/throw-funcref-drc.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-W exceptions -C collector=drc"+;;! flags = "-W exceptions,gc-support -C collector=drc";; A function reference is interned before it is stored in the exception.(modulediff --git a/tests/disas/winch/x64/exceptions/throw-funcref-null.wat b/tests/disas/winch/x64/exceptions/throw-funcref-null.watindex aebe1d5349..70ff561461 100644--- a/tests/disas/winch/x64/exceptions/throw-funcref-null.wat+++ b/tests/disas/winch/x64/exceptions/throw-funcref-null.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-W exceptions -C collector=null"+;;! flags = "-W exceptions,gc-support -C collector=null";; A function reference is interned before it is stored in the exception.(modulediff --git a/tests/disas/winch/x64/exceptions/throw-funcref.wat b/tests/disas/winch/x64/exceptions/throw-funcref.watindex c539a278e0..127d72d920 100644--- a/tests/disas/winch/x64/exceptions/throw-funcref.wat+++ b/tests/disas/winch/x64/exceptions/throw-funcref.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-W exceptions -C collector=copying"+;;! flags = "-W exceptions,gc-support -C collector=copying";; A function reference is interned before it is stored in the exception.(modulediff --git a/tests/disas/winch/x64/exceptions/throw-null.wat b/tests/disas/winch/x64/exceptions/throw-null.watindex a19fd56935..96ba2d972a 100644--- a/tests/disas/winch/x64/exceptions/throw-null.wat+++ b/tests/disas/winch/x64/exceptions/throw-null.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-W exceptions -C collector=null"+;;! flags = "-W exceptions,gc-support -C collector=null";; Calls made while the `try_table` handler is active carry exception metadata.;; Its landing pad loads the exception's payload and branches to `$h`.diff --git a/tests/disas/winch/x64/exceptions/throw.wat b/tests/disas/winch/x64/exceptions/throw.watindex a19c93f969..26c57f0c32 100644--- a/tests/disas/winch/x64/exceptions/throw.wat+++ b/tests/disas/winch/x64/exceptions/throw.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-W exceptions -C collector=copying"+;;! flags = "-W exceptions,gc-support -C collector=copying";; Calls made while the `try_table` handler is active carry exception metadata.;; Its landing pad loads the exception's payload and branches to `$h`.diff --git a/tests/disas/winch/x64/global-get-externref-drc.wat b/tests/disas/winch/x64/global-get-externref-drc.watindex 4d04893636..28bd927e43 100644--- a/tests/disas/winch/x64/global-get-externref-drc.wat+++ b/tests/disas/winch/x64/global-get-externref-drc.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-Ccollector=drc"+;;! flags = "-Wgc-support -Ccollector=drc"(module(global $g (mut externref) (ref.null extern))diff --git a/tests/disas/winch/x64/global-set-externref-drc.wat b/tests/disas/winch/x64/global-set-externref-drc.watindex d4ede43e2e..86a5c91c9f 100644--- a/tests/disas/winch/x64/global-set-externref-drc.wat+++ b/tests/disas/winch/x64/global-set-externref-drc.wat@@ -1,6 +1,6 @@;;! target = "x86_64";;! test = "winch"-;;! flags = "-Ccollector=drc"+;;! flags = "-Wgc-support -Ccollector=drc"(module(global $g (mut externref) (ref.null extern))