Sync wasmparser/wasm-smith reference-types/bulk-memory config

alexcrichton · Dec 11, 2023 · 369bc76 · 369bc76
1 parent c1e28f3
commit 369bc76
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/crates/wasm-smith/src/config.rs b/crates/wasm-smith/src/config.rs
@@ -576,7 +576,7 @@ impl<'a> Arbitrary<'a> for SwarmConfig {
             max_tables,
             max_memory_pages: u.arbitrary()?,
             min_uleb_size: u.int_in_range(0..=5)?,
-            bulk_memory_enabled: reference_types_enabled || u.arbitrary()?,
+            bulk_memory_enabled: u.arbitrary()?,
             reference_types_enabled,
             simd_enabled: u.arbitrary()?,
             multi_value_enabled: u.arbitrary()?,

diff --git a/crates/wasm-smith/src/core.rs b/crates/wasm-smith/src/core.rs
@@ -1149,11 +1149,13 @@ impl Module {
 
         // Reference types allows us to create passive and declared element
         // segments.
-        if self.config.reference_types_enabled() {
+        if self.config.bulk_memory_enabled() {
             funcrefs.push(Box::new(|_| Ok((ElementKind::Passive, None))));
-            externrefs.push(Box::new(|_| Ok((ElementKind::Passive, None))));
             funcrefs.push(Box::new(|_| Ok((ElementKind::Declared, None))));
-            externrefs.push(Box::new(|_| Ok((ElementKind::Declared, None))));
+            if self.config.reference_types_enabled() {
+                externrefs.push(Box::new(|_| Ok((ElementKind::Passive, None))));
+                externrefs.push(Box::new(|_| Ok((ElementKind::Declared, None))));
+            }
         }
 
         let mut choices = Vec::new();

diff --git a/crates/wasm-smith/src/core/code_builder.rs b/crates/wasm-smith/src/core/code_builder.rs
@@ -4869,7 +4869,7 @@ fn table_init(
 
 #[inline]
 fn elem_drop_valid(module: &Module, _builder: &mut CodeBuilder) -> bool {
-    module.config.reference_types_enabled() && module.elems.len() > 0
+    module.config.bulk_memory_enabled() && module.elems.len() > 0
 }
 
 fn elem_drop(

diff --git a/fuzz/src/validate_valid_module.rs b/fuzz/src/validate_valid_module.rs
@@ -29,8 +29,8 @@ pub fn run(u: &mut Unstructured<'_>) -> Result<()> {
         component_model: generate_component,
         multi_value: config.multi_value_enabled,
         multi_memory: config.max_memories > 1,
-        bulk_memory: true,
-        reference_types: true,
+        bulk_memory: config.bulk_memory_enabled,
+        reference_types: config.reference_types_enabled,
         simd: config.simd_enabled,
         relaxed_simd: config.relaxed_simd_enabled,
         memory64: config.memory64_enabled,