instance: release jit code memory on drop

Author: baflor

src/cow_memory.rs

@@ -175,13 +175,10 @@ impl CowResetMapping {
 impl Drop for CowResetMapping {
     fn drop(&mut self) {
         tracy_full::zone!("CowResetMapping::drop");
-        unsafe {
-            rustix::mm::munmap(self.ptr, self.mapping_size).expect("failed to deallocate mapping")
-        };
-        unsafe {
-            rustix::mm::munmap(self.ref_ptr, self.mapping_size)
-                .expect("failed to deallocate mapping")
-        };
+        unsafe { rustix::mm::munmap(self.ptr, self.mapping_size) }
+            .expect("failed to deallocate mapping");
+        unsafe { rustix::mm::munmap(self.ref_ptr, self.mapping_size) }
+            .expect("failed to deallocate mapping");
     }
 }
 

src/fuzzer/i2s_patches.rs

@@ -243,7 +243,7 @@ where
                 'outer: for i in off..len {
                     let mut size = core::cmp::min(a.len(), len - i);
                     while size != 0 {
-                        if &a[0..size] == &input.mutator_bytes()[i..i + size] {
+                        if a[0..size] == input.mutator_bytes()[i..i + size] {
                             input.mutator_bytes_mut()[i..i + size].copy_from_slice(&b[0..size]);
                             result = MutationResult::Mutated;
                             break 'outer;
@@ -252,7 +252,7 @@ where
                     }
                     size = core::cmp::min(b.len(), len - i);
                     while size != 0 {
-                        if &b[0..size] == &input.mutator_bytes()[i..i + size] {
+                        if b[0..size] == input.mutator_bytes()[i..i + size] {
                             input.mutator_bytes_mut()[i..i + size].copy_from_slice(&b[0..size]);
                             result = MutationResult::Mutated;
                             break 'outer;

src/jit/instance.rs

@@ -8,8 +8,7 @@ use super::{CompilationOptions, module::TrapKind, vmcontext::VMContext};
 pub(crate) struct ModuleInstance {
     pub vmctx: Box<VMContext>,
     pub code_size: usize,
-    #[allow(unused)]
-    module: JITModule,
+    module: Option<JITModule>,
     export_func_ptrs: HashMap<String, *const u8>,
     trap_pc_registry: HashMap<usize, TrapKind>,
     options: CompilationOptions,
@@ -26,7 +25,7 @@ impl ModuleInstance {
     ) -> Self {
         Self {
             vmctx,
-            module,
+            module: Some(module),
             export_func_ptrs,
             trap_pc_registry,
             code_size,
@@ -94,3 +93,12 @@ impl ModuleInstance {
         }
     }
 }
+
+impl Drop for ModuleInstance {
+    fn drop(&mut self) {
+        tracy_full::zone!("ModuleInstance::drop");
+        if let Some(module) = std::mem::take(&mut self.module) {
+            unsafe { module.free_memory() };
+        }
+    }
+}