Revert "passes: use trait_upcasting feature (Rust 1.86)"

This reverts commit 58c026a.

ErasedInstrumentationPassHelper enum doesn't play nice here.

Author: baflor

Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = []
 license = "Apache-2.0 OR MIT"
 edition = "2021"
-rust-version = "1.86"
+rust-version = "1.83"
 
 [dependencies]
 wat = "1.0"

src/instrumentation/code_coverage.rs

@@ -126,6 +126,10 @@ impl CodeCovInstrumentationPass for EdgeCoveragePass {
     fn coverage_mut(&mut self) -> &mut CoverageBitset<Self::Key> {
         &mut self.coverage
     }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self as &dyn std::any::Any
+    }
 }
 
 pub(crate) struct FunctionCoveragePass {
@@ -165,6 +169,10 @@ impl CodeCovInstrumentationPass for FunctionCoveragePass {
         self.coverage
             .instrument(&FuncIdx(ctx.state.fidx), ctx, self);
     }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self as &dyn std::any::Any
+    }
 }
 
 pub(crate) struct BBCoveragePass {
@@ -197,4 +205,8 @@ impl CodeCovInstrumentationPass for BBCoveragePass {
     fn instrument_basic_block(&self, ctx: InstrCtx) {
         self.coverage.instrument(&ctx.state.loc(), ctx, self);
     }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self as &dyn std::any::Any
+    }
 }

src/instrumentation/mod.rs

@@ -146,10 +146,11 @@ impl Passes {
     }
 }
 
-pub(crate) trait ErasedCovSnapshot: Any {
+pub(crate) trait ErasedCovSnapshot {
     fn clear(&mut self);
     fn update_with(&mut self, other: &dyn ErasedCovSnapshot) -> bool;
     fn mem_usage(&self) -> usize;
+    fn as_any(&self) -> &dyn Any;
 }
 
 #[derive(libafl_bolts::SerdeAny)]
@@ -411,13 +412,15 @@ impl<K: Ord + Clone, V: Clone + FeedbackLattice> AssociatedCoverageArray<K, V> {
                 *self = Self::Full(vec![V::bottom(); len].into_boxed_slice());
             }
             fn update_with(&mut self, other: &dyn ErasedCovSnapshot) -> bool {
-                if let Some(other) = (other as &dyn Any).downcast_ref::<Self>() {
+                if let Some(other) = other.as_any().downcast_ref::<Self>() {
                     self._update_with(other)
                 } else {
                     false
                 }
             }
-
+            fn as_any(&self) -> &dyn Any {
+                self as &dyn Any
+            }
             fn mem_usage(&self) -> usize {
                 match self {
                     SparseLatticeBox::Full(x) => x.len() * std::mem::size_of::<V>(),

src/instrumentation/path_hash.rs

@@ -250,6 +250,10 @@ impl HashBitsetInstrumentationPass for FuncPathHashPass {
         }
         self.coverage.mix_and_instrument(key, ctx, self);
     }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self as &dyn std::any::Any
+    }
 }
 
 pub(crate) struct EdgePathHashPass {
@@ -294,4 +298,8 @@ impl HashBitsetInstrumentationPass for EdgePathHashPass {
         }
         self.coverage.mix_and_instrument(key, ctx, self);
     }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self as &dyn std::any::Any
+    }
 }

src/instrumentation/swarm.rs

@@ -106,6 +106,10 @@ impl ErasedInstrumentationPass for SwarmShortCircuitPass {
         "swarm-short-circuit"
     }
 
+    fn as_any(&self) -> &dyn std::any::Any {
+        self as &dyn std::any::Any
+    }
+
     fn instrument_function(&self, mut ctx: InstrCtx) {
         let f = ctx.state.loc().function;
         if self.config.avoid_functions.contains(&f) {

src/instrumentation/traits.rs

@@ -54,6 +54,9 @@ macro_rules! instrumentation_hook_fn_defs {
 
 macro_rules! impl_kv_instrumentation_pass {
     () => {
+        fn as_any(&self) -> &dyn std::any::Any {
+            self as &dyn std::any::Any
+        }
         fn coverage(&self) -> &AssociatedCoverageArray<Self::Key, Self::Value> {
             &self.coverage
         }
@@ -70,13 +73,14 @@ macro_rules! impl_kv_instrumentation_pass {
 }
 pub(crate) use impl_kv_instrumentation_pass;
 
-pub(crate) trait KVInstrumentationPass: Any {
+pub(crate) trait KVInstrumentationPass {
     type Key: Into<Location> + Ord + Clone; // = Location
     type Value: FeedbackLattice + 'static;
 
     /// Returns a short string (<12 chars) that describes this specific pass
     fn shortcode(&self) -> &'static str;
 
+    fn as_any(&self) -> &dyn Any;
     fn coverage(&self) -> &AssociatedCoverageArray<Self::Key, Self::Value>;
     fn coverage_mut(&mut self) -> &mut AssociatedCoverageArray<Self::Key, Self::Value>;
 
@@ -137,6 +141,8 @@ pub(crate) trait CodeCovInstrumentationPass {
             .unwrap(),
         )
     }
+
+    fn as_any(&self) -> &dyn Any;
 }
 
 pub(crate) trait HashBitsetInstrumentationPass {
@@ -166,16 +172,19 @@ pub(crate) trait HashBitsetInstrumentationPass {
             .unwrap(),
         )
     }
+
+    fn as_any(&self) -> &dyn Any;
 }
 
-pub trait ErasedInstrumentationPass: Any {
+pub trait ErasedInstrumentationPass {
     instrumentation_hook_fn_defs!(no_body);
 
     fn update_and_scan_coverage(&mut self) -> bool;
     fn reset_coverage(&mut self);
     fn reset_coverage_keep_saved(&mut self);
     fn snapshot_coverage(&self) -> CovSnapshot;
     fn shortcode(&self) -> &'static str;
+    fn as_any(&self) -> &dyn Any;
 }
 
 macro_rules! dispatch {
@@ -210,4 +219,5 @@ impl<K: Ord + Into<Location> + Clone + 'static, V: FeedbackLattice + 'static>
     dispatch!(reset_coverage_keep_saved(&mut self) -> ());
     dispatch!(snapshot_coverage(&self) -> CovSnapshot);
     dispatch!(shortcode(&self) -> &'static str);
+    dispatch!(as_any(&self) -> &dyn Any);
 }

src/jit/mod.rs

@@ -15,7 +15,6 @@ pub mod util;
 pub mod vmcontext;
 
 use std::{
-    any::Any,
     collections::BTreeSet,
     fmt,
     sync::Arc,
@@ -980,10 +979,9 @@ impl JitFuzzingSession {
         // save malloc coverage
         let new_cov = !self.scan_passes_for_coverage().is_empty();
         let have_codecov_pass = self.passes.iter().any(|pass| {
-            let pass = pass as &dyn std::any::Any;
-            pass.is::<FunctionCoveragePass>()
-                || pass.is::<BBCoveragePass>()
-                || pass.is::<EdgeCoveragePass>()
+            pass.as_any().is::<FunctionCoveragePass>()
+                || pass.as_any().is::<BBCoveragePass>()
+                || pass.as_any().is::<EdgeCoveragePass>()
         });
         assert!(
             new_cov || !have_codecov_pass,
@@ -1139,7 +1137,7 @@ impl JitFuzzingSession {
 
     pub(crate) fn get_pass<T: 'static>(&self) -> &T {
         for pass in self.passes.iter() {
-            if let Some(pass) = (pass as &dyn Any).downcast_ref::<T>() {
+            if let Some(pass) = pass.as_any().downcast_ref::<T>() {
                 return pass;
             }
         }
@@ -1149,7 +1147,7 @@ impl JitFuzzingSession {
     pub(crate) fn get_passes<T: 'static>(&self) -> Vec<&T> {
         let mut passes = Vec::new();
         for pass in self.passes.iter() {
-            if let Some(pass) = (pass as &dyn Any).downcast_ref::<T>() {
+            if let Some(pass) = pass.as_any().downcast_ref::<T>() {
                 passes.push(pass);
             }
         }

src/tests.rs

@@ -50,7 +50,7 @@ impl TestModule {
             .arg(&mod_path)
             .status()
             .expect("failed to compile Rust snippet to WASM");
-        let module = std::fs::read(&mod_path).expect("failed to read compiled test harness module");
+        let module = std::fs::read(&mod_path).unwrap();
         Self { name, module }
     }
 

wasm-fuzzers/Dockerfile.wasmfuzz

@@ -1,7 +1,7 @@
 FROM ubuntu:24.04 AS builder
 RUN apt-get update && apt-get install -y rustup git clang
-RUN rustup toolchain add 1.86 --no-self-update
-ARG COMMIT="9f904255398d1006427091953ea9746f7134b9dd"
+RUN rustup toolchain add 1.83 --no-self-update
+ARG COMMIT="74d05874d2d85cc0921cda9c03dbe1de77df0ea3"
 RUN git clone https://github.com/CISPA-SysSec/wasmfuzz && git -C wasmfuzz checkout "$COMMIT"
 RUN cargo install --locked --no-default-features --path /wasmfuzz