winch(x64): Call indirect

build.rs

@@ -205,11 +205,17 @@ fn ignore(testsuite: &str, testname: &str, strategy: &str) -> bool {
     // We ignore tests that assert for traps on windows, given
     // that Winch doesn't encode unwind information for Windows, yet.
     if strategy == "Winch" {
+        if testsuite == "misc_testsuite" {
+            // The misc/call_indirect is fully supported by Winch.
+            if testname == "call_indirect" {
+                return false;
+            }
+        }
         if testsuite != "winch" {
             return true;
         }
 
-        let assert_trap = ["i32", "i64"].contains(&testname);
+        let assert_trap = ["i32", "i64", "call_indirect"].contains(&testname);
 
         if assert_trap && env::var("CARGO_CFG_TARGET_OS").unwrap().as_str() == "windows" {
             return true;

crates/winch/src/compiler.rs

@@ -68,7 +68,7 @@ impl wasmtime_environ::Compiler for Compiler {
         let mut validator = validator.into_validator(self.take_allocations());
         let buffer = self
             .isa
-            .compile_function(ty, &body, &translation, &mut validator)
+            .compile_function(ty, types, &body, &translation, &mut validator)
             .map_err(|e| CompileError::Codegen(format!("{e:?}")));
         self.save_allocations(validator.into_allocations());
         let buffer = buffer?;

fuzz/fuzz_targets/differential.rs

@@ -374,7 +374,8 @@ fn winch_supports_module(module: &[u8]) -> bool {
                         | F32Abs { .. }
                         | F64Abs { .. }
                         | F32Neg { .. }
-                        | F64Neg { .. } => {}
+                        | F64Neg { .. }
+                        | CallIndirect { .. } => {}
                         _ => {
                             supported = false;
                             break 'main;