Remove impl Default from our WasmSmithModule wrappers.

Manually impl Arbitrary in equivalence jit so that we can apply the termination there. This applies it in one place whether we're in cargo fuzz run or in cargo fuzz fmt.
JesseStutler · Apr 16, 2021 · b2ad87f · b2ad87f
1 parent f0e5f2f
commit b2ad87f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/fuzz/fuzz_targets/equivalence_jit.rs b/fuzz/fuzz_targets/equivalence_jit.rs
@@ -31,13 +31,12 @@ impl Config for ExportedFunctionConfig {
     }
 }
 
-#[derive(Arbitrary)]
 struct WasmSmithModule(ConfiguredModule<ExportedFunctionConfig>);
-impl Default for WasmSmithModule {
-    fn default() -> Self {
-        let mut inner = ConfiguredModule::<ExportedFunctionConfig>::default();
-        inner.ensure_termination(100000);
-        Self(inner)
+impl<'a> arbitrary::Arbitrary<'a> for WasmSmithModule {
+    fn arbitrary(u: &mut arbitrary::Unstructured<'a>) -> arbitrary::Result<Self> {
+        let mut module = ConfiguredModule::<ExportedFunctionConfig>::arbitrary(u)?;
+        module.ensure_termination(100000);
+        Ok(WasmSmithModule(module))
     }
 }
 impl std::fmt::Debug for WasmSmithModule {

diff --git a/fuzz/fuzz_targets/jit_cranelift.rs b/fuzz/fuzz_targets/jit_cranelift.rs
@@ -20,7 +20,7 @@ impl Config for NoImportsConfig {
         false
     }
 }
-#[derive(Default, Arbitrary)]
+#[derive(Arbitrary)]
 struct WasmSmithModule(ConfiguredModule<NoImportsConfig>);
 impl std::fmt::Debug for WasmSmithModule {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {

diff --git a/fuzz/fuzz_targets/jit_llvm.rs b/fuzz/fuzz_targets/jit_llvm.rs
@@ -20,7 +20,7 @@ impl Config for NoImportsConfig {
         false
     }
 }
-#[derive(Default, Arbitrary)]
+#[derive(Arbitrary)]
 struct WasmSmithModule(ConfiguredModule<NoImportsConfig>);
 impl std::fmt::Debug for WasmSmithModule {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {

diff --git a/fuzz/fuzz_targets/jit_singlepass.rs b/fuzz/fuzz_targets/jit_singlepass.rs
@@ -20,7 +20,7 @@ impl Config for NoImportsConfig {
         false
     }
 }
-#[derive(Default, Arbitrary)]
+#[derive(Arbitrary)]
 struct WasmSmithModule(ConfiguredModule<NoImportsConfig>);
 impl std::fmt::Debug for WasmSmithModule {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {

diff --git a/fuzz/fuzz_targets/metering.rs b/fuzz/fuzz_targets/metering.rs
@@ -24,7 +24,7 @@ impl Config for NoImportsConfig {
     }
 }
 
-#[derive(Default, Arbitrary)]
+#[derive(Arbitrary)]
 struct WasmSmithModule(ConfiguredModule<NoImportsConfig>);
 impl std::fmt::Debug for WasmSmithModule {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {

diff --git a/fuzz/fuzz_targets/native_cranelift.rs b/fuzz/fuzz_targets/native_cranelift.rs
@@ -20,7 +20,7 @@ impl Config for NoImportsConfig {
         false
     }
 }
-#[derive(Default, Arbitrary)]
+#[derive(Arbitrary)]
 struct WasmSmithModule(ConfiguredModule<NoImportsConfig>);
 impl std::fmt::Debug for WasmSmithModule {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {