wasm-mutate: Fix rules that used 1_i64 inside i32.sh{l,r_u} expressions

Author: fitzgen

crates/wasm-mutate/src/mutators/peephole.rs

@@ -254,6 +254,8 @@ impl PeepholeMutator {
                 let iterator = iterator
                     .filter(move |expr| !expr.to_string().eq(&startcmp.to_string()))
                     .map(move |expr| {
+                        log::trace!("Yielding expression:\n{}", expr.pretty(60));
+
                         let mut newfunc = self.copy_locals(reader)?;
                         let needed_resources = Encoder::build_function(
                             config,

crates/wasm-mutate/src/mutators/peephole/rules.rs

@@ -489,7 +489,7 @@ impl PeepholeMutator {
                 // `x <=> x << 1`
                 rules.extend(rewrite!(
                     "i32.shl-1";
-                    "?x" <=> "(i32.shl ?x 1_i64)"
+                    "?x" <=> "(i32.shl ?x 1_i32)"
                         if self.is_type("?x", PrimitiveTypeInfo::I32)
                 ));
                 rules.extend(rewrite!(
@@ -501,7 +501,7 @@ impl PeepholeMutator {
                 // `x <=> x >> 1`
                 rules.extend(rewrite!(
                     "i32.shr_u-1";
-                    "?x" <=> "(i32.shr_u ?x 1_i64)"
+                    "?x" <=> "(i32.shr_u ?x 1_i32)"
                         if self.is_type("?x", PrimitiveTypeInfo::I32)
                 ));
                 rules.extend(rewrite!(
@@ -511,7 +511,7 @@ impl PeepholeMutator {
                 ));
                 rules.extend(rewrite!(
                     "i32.shr_s-1";
-                    "?x" <=> "(i32.shr_s ?x 1_i64)"
+                    "?x" <=> "(i32.shr_s ?x 1_i32)"
                         if self.is_type("?x", PrimitiveTypeInfo::I32)
                 ));
                 rules.extend(rewrite!(

fuzz/fuzz_targets/mutate.rs

@@ -91,9 +91,11 @@ fuzz_target!(|bytes: &[u8]| {
         log::debug!("validation result = {:?}", validation_result);
 
         if log::log_enabled!(log::Level::Debug) {
+            log::debug!("writing mutated Wasm to `mutated.wasm`");
             std::fs::write("mutated.wasm", &mutated_wasm)
                 .expect("should write `mutated.wasm` okay");
             if let Ok(mutated_wat) = wasmprinter::print_bytes(&mutated_wasm) {
+                log::debug!("writing mutated WAT to `mutated.wat`");
                 std::fs::write("mutated.wat", &mutated_wat)
                     .expect("should write `mutated.wat` okay");
             }