Implement Wasm tail-call proposal

crates/wasmi/benches/bench/mod.rs

@@ -23,6 +23,7 @@ pub fn load_wasm_from_file(file_name: &str) -> Vec<u8> {
 /// Returns a [`Config`] useful for benchmarking.
 fn bench_config() -> Config {
     let mut config = Config::default();
+    config.wasm_tail_call(true);
     config.set_stack_limits(StackLimits::new(1024, 1024 * 1024, 64 * 1024).unwrap());
     config
 }

crates/wasmi/benches/wat/fibonacci.wat

@@ -27,15 +27,15 @@
                 (return (local.get $b))
             )
         )
-        (call $fib_tail_recursive
+        (return_call $fib_tail_recursive
             (i64.sub (local.get $N) (i64.const 1))
             (local.get $b)
             (i64.add (local.get $a) (local.get $b))
         )
     )
 
     (func (export "fibonacci_tail") (param $N i64) (result i64)
-        (call $fib_tail_recursive (local.get $N) (i64.const 0) (i64.const 1))
+        (return_call $fib_tail_recursive (local.get $N) (i64.const 0) (i64.const 1))
     )
 
     (func $fib_iterative (export "fibonacci_iter") (param $N i64) (result i64)

crates/wasmi/src/engine/bytecode/mod.rs

@@ -53,6 +53,15 @@ pub enum Instruction {
     },
     Return(DropKeep),
     ReturnIfNez(DropKeep),
+    ReturnCall {
+        drop_keep: DropKeep,
+        func: FuncIdx,
+    },
+    ReturnCallIndirect {
+        drop_keep: DropKeep,
+        table: TableIdx,
+        func_type: SignatureIdx,
+    },
     Call(FuncIdx),
     CallIndirect {
         table: TableIdx,

crates/wasmi/src/engine/config.rs

@@ -25,6 +25,8 @@ pub struct Config {
     bulk_memory: bool,
     /// Is `true` if the [`reference-types`] Wasm proposal is enabled.
     reference_types: bool,
+    /// Is `true` if the [`tail-call`] Wasm proposal is enabled.
+    tail_call: bool,
     /// Is `true` if Wasm instructions on `f32` and `f64` types are allowed.
     floats: bool,
     /// Is `true` if `wasmi` executions shall consume fuel.
@@ -94,6 +96,7 @@ impl Default for Config {
             multi_value: true,
             bulk_memory: true,
             reference_types: true,
+            tail_call: false,
             floats: true,
             consume_fuel: false,
             fuel_costs: FuelCosts::default(),
@@ -201,6 +204,18 @@ impl Config {
         self
     }
 
+    /// Enable or disable the [`tail-call`] Wasm proposal for the [`Config`].
+    ///
+    /// # Note
+    ///
+    /// Disabled by default.
+    ///
+    /// [`tail-call`]: https://github.com/WebAssembly/tail-calls
+    pub fn wasm_tail_call(&mut self, enable: bool) -> &mut Self {
+        self.tail_call = enable;
+        self
+    }
+
     /// Enable or disable Wasm floating point (`f32` and `f64`) instructions and types.
     ///
     /// Enabled by default.
@@ -252,12 +267,12 @@ impl Config {
             sign_extension: self.sign_extension,
             bulk_memory: self.bulk_memory,
             reference_types: self.reference_types,
+            tail_call: self.tail_call,
             floats: self.floats,
             component_model: false,
             simd: false,
             relaxed_simd: false,
             threads: false,
-            tail_call: false,
             multi_memory: false,
             exceptions: false,
             memory64: false,

crates/wasmi/src/engine/executor.rs

@@ -25,6 +25,7 @@ use crate::{
     table::TableEntity,
     Func,
     FuncRef,
+    Instance,
     StoreInner,
     Table,
 };
@@ -42,7 +43,7 @@ pub enum WasmOutcome {
     /// The Wasm execution has ended and returns to the host side.
     Return,
     /// The Wasm execution calls a host function.
-    Call(Func),
+    Call { host_func: Func, instance: Instance },
 }
 
 /// The outcome of a Wasm execution.
@@ -56,7 +57,16 @@ pub enum CallOutcome {
     /// The Wasm execution continues in Wasm.
     Continue,
     /// The Wasm execution calls a host function.
-    Call(Func),
+    Call { host_func: Func, instance: Instance },
+}
+
+/// The kind of a function call.
+#[derive(Debug, Copy, Clone)]
+pub enum CallKind {
+    /// A nested function call.
+    Nested,
+    /// A tailing function call.
+    Tail,
 }
 
 /// The outcome of a Wasm return statement.
@@ -203,16 +213,56 @@ impl<'ctx, 'engine> Executor<'ctx, 'engine> {
                         return Ok(WasmOutcome::Return);
                     }
                 }
+                Instr::ReturnCall { drop_keep, func } => {
+                    if let CallOutcome::Call {
+                        host_func,
+                        instance,
+                    } = self.visit_return_call(drop_keep, func)?
+                    {
+                        return Ok(WasmOutcome::Call {
+                            host_func,
+                            instance,
+                        });
+                    }
+                }
+                Instr::ReturnCallIndirect {
+                    drop_keep,
+                    table,
+                    func_type,
+                } => {
+                    if let CallOutcome::Call {
+                        host_func,
+                        instance,
+                    } = self.visit_return_call_indirect(drop_keep, table, func_type)?
+                    {
+                        return Ok(WasmOutcome::Call {
+                            host_func,
+                            instance,
+                        });
+                    }
+                }
                 Instr::Call(func) => {
-                    if let CallOutcome::Call(host_func) = self.visit_call(func)? {
-                        return Ok(WasmOutcome::Call(host_func));
+                    if let CallOutcome::Call {
+                        host_func,
+                        instance,
+                    } = self.visit_call(func)?
+                    {
+                        return Ok(WasmOutcome::Call {
+                            host_func,
+                            instance,
+                        });
                     }
                 }
                 Instr::CallIndirect { table, func_type } => {
-                    if let CallOutcome::Call(host_func) =
-                        self.visit_call_indirect(table, func_type)?
+                    if let CallOutcome::Call {
+                        host_func,
+                        instance,
+                    } = self.visit_call_indirect(table, func_type)?
                     {
-                        return Ok(WasmOutcome::Call(host_func));
+                        return Ok(WasmOutcome::Call {
+                            host_func,
+                            instance,
+                        });
                     }
                 }
                 Instr::Drop => self.visit_drop(),
@@ -519,24 +569,30 @@ impl<'ctx, 'engine> Executor<'ctx, 'engine> {
     /// the function call so that the stack and execution state is synchronized
     /// with the outer structures.
     #[inline(always)]
-    fn call_func(&mut self, func: &Func) -> Result<CallOutcome, TrapCode> {
+    fn call_func(&mut self, func: &Func, kind: CallKind) -> Result<CallOutcome, TrapCode> {
         self.next_instr();
         self.sync_stack_ptr();
-        self.call_stack
-            .push(FuncFrame::new(self.ip, self.cache.instance()))?;
-        let wasm_func = match self.ctx.resolve_func(func) {
-            FuncEntity::Wasm(wasm_func) => wasm_func,
+        if matches!(kind, CallKind::Nested) {
+            self.call_stack
+                .push(FuncFrame::new(self.ip, self.cache.instance()))?;
+        }
+        match self.ctx.resolve_func(func) {
+            FuncEntity::Wasm(wasm_func) => {
+                let header = self.code_map.header(wasm_func.func_body());
+                self.value_stack.prepare_wasm_call(header)?;
+                self.sp = self.value_stack.stack_ptr();
+                self.cache.update_instance(wasm_func.instance());
+                self.ip = self.code_map.instr_ptr(header.iref());
+                Ok(CallOutcome::Continue)
+            }
             FuncEntity::Host(_host_func) => {
                 self.cache.reset();
-                return Ok(CallOutcome::Call(*func));
+                Ok(CallOutcome::Call {
+                    host_func: *func,
+                    instance: *self.cache.instance(),
+                })
             }
-        };
-        let header = self.code_map.header(wasm_func.func_body());
-        self.value_stack.prepare_wasm_call(header)?;
-        self.sp = self.value_stack.stack_ptr();
-        self.cache.update_instance(wasm_func.instance());
-        self.ip = self.code_map.instr_ptr(header.iref());
-        Ok(CallOutcome::Continue)
+        }
     }
 
     /// Returns to the caller.
@@ -608,6 +664,48 @@ impl<'ctx, 'engine> Executor<'ctx, 'engine> {
     fn fuel_costs(&self) -> &FuelCosts {
         self.ctx.engine().config().fuel_costs()
     }
+
+    /// Executes a `call` or `return_call` instruction.
+    #[inline(always)]
+    fn execute_call(
+        &mut self,
+        func_index: FuncIdx,
+        kind: CallKind,
+    ) -> Result<CallOutcome, TrapCode> {
+        let callee = self.cache.get_func(self.ctx, func_index);
+        self.call_func(&callee, kind)
+    }
+
+    /// Executes a `call_indirect` or `return_call_indirect` instruction.
+    #[inline(always)]
+    fn execute_call_indirect(
+        &mut self,
+        table: TableIdx,
+        func_index: u32,
+        func_type: SignatureIdx,
+        kind: CallKind,
+    ) -> Result<CallOutcome, TrapCode> {
+        let table = self.cache.get_table(self.ctx, table);
+        let funcref = self
+            .ctx
+            .resolve_table(&table)
+            .get_untyped(func_index)
+            .map(FuncRef::from)
+            .ok_or(TrapCode::TableOutOfBounds)?;
+        let func = funcref.func().ok_or(TrapCode::IndirectCallToNull)?;
+        let actual_signature = self.ctx.resolve_func(func).ty_dedup();
+        let expected_signature = self
+            .ctx
+            .resolve_instance(self.cache.instance())
+            .get_signature(func_type.into_inner())
+            .unwrap_or_else(|| {
+                panic!("missing signature for call_indirect at index: {func_type:?}")
+            });
+        if actual_signature != expected_signature {
+            return Err(TrapCode::BadSignature).map_err(Into::into);
+        }
+        self.call_func(func, kind)
+    }
 }
 
 impl<'ctx, 'engine> Executor<'ctx, 'engine> {
@@ -712,10 +810,32 @@ impl<'ctx, 'engine> Executor<'ctx, 'engine> {
         self.next_instr()
     }
 
+    #[inline(always)]
+    fn visit_return_call(
+        &mut self,
+        drop_keep: DropKeep,
+        func_index: FuncIdx,
+    ) -> Result<CallOutcome, TrapCode> {
+        self.sp.drop_keep(drop_keep);
+        self.execute_call(func_index, CallKind::Tail)
+    }
+
+    #[inline(always)]
+    fn visit_return_call_indirect(
+        &mut self,
+        drop_keep: DropKeep,
+        table: TableIdx,
+        func_type: SignatureIdx,
+    ) -> Result<CallOutcome, TrapCode> {
+        let func_index: u32 = self.sp.pop_as();
+        self.sp.drop_keep(drop_keep);
+        self.execute_call_indirect(table, func_index, func_type, CallKind::Tail)
+    }
+
     #[inline(always)]
     fn visit_call(&mut self, func_index: FuncIdx) -> Result<CallOutcome, TrapCode> {
         let callee = self.cache.get_func(self.ctx, func_index);
-        self.call_func(&callee)
+        self.call_func(&callee, CallKind::Nested)
     }
 
     #[inline(always)]
@@ -725,26 +845,7 @@ impl<'ctx, 'engine> Executor<'ctx, 'engine> {
         func_type: SignatureIdx,
     ) -> Result<CallOutcome, TrapCode> {
         let func_index: u32 = self.sp.pop_as();
-        let table = self.cache.get_table(self.ctx, table);
-        let funcref = self
-            .ctx
-            .resolve_table(&table)
-            .get_untyped(func_index)
-            .map(FuncRef::from)
-            .ok_or(TrapCode::TableOutOfBounds)?;
-        let func = funcref.func().ok_or(TrapCode::IndirectCallToNull)?;
-        let actual_signature = self.ctx.resolve_func(func).ty_dedup();
-        let expected_signature = self
-            .ctx
-            .resolve_instance(self.cache.instance())
-            .get_signature(func_type.into_inner())
-            .unwrap_or_else(|| {
-                panic!("missing signature for call_indirect at index: {func_type:?}")
-            });
-        if actual_signature != expected_signature {
-            return Err(TrapCode::BadSignature).map_err(Into::into);
-        }
-        self.call_func(func)
+        self.execute_call_indirect(table, func_index, func_type, CallKind::Nested)
     }
 
     #[inline(always)]

crates/wasmi/src/engine/func_builder/mod.rs

@@ -135,6 +135,9 @@ macro_rules! impl_visit_operator {
     ( @reference_types $($rest:tt)* ) => {
         impl_visit_operator!(@@supported $($rest)*);
     };
+    ( @tail_call $($rest:tt)* ) => {
+        impl_visit_operator!(@@supported $($rest)*);
+    };
     ( @@supported $op:ident $({ $($arg:ident: $argty:ty),* })? => $visit:ident $($rest:tt)* ) => {
         fn $visit(&mut self $($(,$arg: $argty)*)?) -> Self::Output {
             let offset = self.current_pos();