wasmparser: feature gate Wasm simd support

Cargo.toml

@@ -102,7 +102,7 @@ wasm-metadata = { version = "0.220.0", path = "crates/wasm-metadata" }
 wasm-mutate = { version = "0.220.0", path = "crates/wasm-mutate" }
 wasm-shrink = { version = "0.220.0", path = "crates/wasm-shrink" }
 wasm-smith = { version = "0.220.0", path = "crates/wasm-smith" }
-wasmparser = { version = "0.220.0", path = "crates/wasmparser", default-features = false, features = ['std'] }
+wasmparser = { version = "0.220.0", path = "crates/wasmparser", default-features = false, features = ['std','simd'] }
 wasmprinter = { version = "0.220.0", path = "crates/wasmprinter", default-features = false }
 wast = { version = "220.0.0", path = "crates/wast", default-features = false }
 wat = { version = "1.220.0", path = "crates/wat", default-features = false }
@@ -122,7 +122,7 @@ wat = { workspace = true, features = ['dwarf', 'component-model'] }
 termcolor = { workspace = true }
 
 # Dependencies of `validate`
-wasmparser = { workspace = true, optional = true, features = ['component-model'] }
+wasmparser = { workspace = true, optional = true, features = ['component-model', 'simd'] }
 rayon = { workspace = true, optional = true }
 bitflags = { workspace = true, optional = true }
 

crates/wasm-encoder/Cargo.toml

@@ -24,7 +24,7 @@ leb128 = { workspace = true }
 
 # Enable this dependency to get a bunch of `From<wasmparser::Foo> for
 # wasm_encoder::Foo` impls.
-wasmparser = { optional = true, workspace = true }
+wasmparser = { optional = true, workspace = true, features = ["simd"] }
 
 [dev-dependencies]
 anyhow = { workspace = true }

crates/wasm-encoder/src/reencode.rs

@@ -1563,6 +1563,7 @@ pub mod utils {
                             translate!(build $op $($($arg)*)?)
                         }
                     )*
+                    unexpected => unreachable!("encountered unexpected Wasm operator: {unexpected:?}"),
                 })
             };
 

crates/wasm-mutate/Cargo.toml

@@ -13,8 +13,8 @@ workspace = true
 [dependencies]
 clap = { workspace = true, optional = true }
 thiserror = "1.0.28"
-wasmparser = { workspace = true }
-wasm-encoder = { workspace = true, features = ["wasmparser"] }
+wasmparser = { workspace = true, features = ['simd'] }
+wasm-encoder = { workspace = true, features = ['wasmparser'] }
 rand = { workspace = true }
 log = { workspace = true }
 egg = "0.6.0"
@@ -24,4 +24,4 @@ anyhow = { workspace = true }
 wat = { workspace = true }
 wasmprinter = { workspace = true }
 env_logger = { workspace = true }
-wasmparser = { workspace = true, features = ['validate', 'features'] }
+wasmparser = { workspace = true, features = ['validate', 'features', 'simd'] }

crates/wasm-smith/Cargo.toml

@@ -32,13 +32,13 @@ leb128 = { workspace = true }
 serde = { workspace = true, optional = true }
 serde_derive = { workspace = true, optional = true }
 wasm-encoder = { workspace = true }
-wasmparser = { workspace = true, optional = true, features = ['validate', 'features'] }
+wasmparser = { workspace = true, optional = true, features = ['validate', 'features', 'simd'] }
 wat = { workspace = true, optional = true }
 
 [dev-dependencies]
 criterion = { workspace = true }
 rand = { workspace = true }
-wasmparser = { workspace = true, features = ["validate", "features"] }
+wasmparser = { workspace = true, features = ['validate', 'features', 'simd'] }
 wasmprinter = { workspace = true }
 wat = { workspace = true }
 

crates/wasmparser/Cargo.toml

@@ -42,7 +42,7 @@ name = "benchmark"
 harness = false
 
 [features]
-default = ['std', 'validate', 'serde', 'features', 'component-model', 'hash-collections']
+default = ['std', 'validate', 'serde', 'features', 'component-model', 'hash-collections', 'simd']
 
 # A feature which enables implementations of `std::error::Error` as appropriate
 # along with other convenience APIs. This additionally uses the standard
@@ -82,3 +82,8 @@ features = []
 # WebAssembly. This is enabled by default but if your use case is only
 # interested in working with core modules then this feature can be disabled.
 component-model = ['dep:semver']
+
+# A feature that enables parsing and validating the `simd` and `relaxed-simd`
+# proposals for WebAssembly. This is enabled by default but if your use case is
+# only interested in working on non-SIMD code then this feature can be disabled.
+simd = []

crates/wasmparser/benches/benchmark.rs

@@ -4,6 +4,7 @@ use once_cell::unsync::Lazy;
 use std::fs;
 use std::path::Path;
 use std::path::PathBuf;
+use wasmparser::VisitSimdOperator;
 use wasmparser::{DataKind, ElementKind, Parser, Payload, Validator, VisitOperator, WasmFeatures};
 
 /// A benchmark input.
@@ -364,5 +365,14 @@ macro_rules! define_visit_operator {
 impl<'a> VisitOperator<'a> for NopVisit {
     type Output = ();
 
-    wasmparser::for_each_operator!(define_visit_operator);
+    fn simd_visitor(&mut self) -> Option<&mut dyn VisitSimdOperator<'a, Output = Self::Output>> {
+        Some(self)
+    }
+
+    wasmparser::for_each_visit_operator!(define_visit_operator);
+}
+
+#[allow(unused_variables)]
+impl<'a> VisitSimdOperator<'a> for NopVisit {
+    wasmparser::for_each_visit_simd_operator!(define_visit_operator);
 }

crates/wasmparser/src/arity.rs

@@ -253,6 +253,6 @@ impl Operator<'_> {
                 }
             );
         }
-        for_each_operator!(define_arity)
+        crate::for_each_operator!(define_arity)
     }
 }