Pass only number of args to invoke_function()

Author: chfast

lib/fizzy/execute.cpp

@@ -426,10 +426,9 @@ void branch(const Code& code, OperandStack& stack, const Instr*& pc, const uint8
 }
 
 template <class F>
-inline bool invoke_function(const FuncType& func_type, const F& func, Instance& instance,
-    OperandStack& stack, int depth) noexcept
+inline bool invoke_function(
+    size_t num_args, const F& func, Instance& instance, OperandStack& stack, int depth) noexcept
 {
-    const auto num_args = func_type.inputs.size();
     assert(stack.size() >= num_args);
     span<const Value> call_args{stack.rend() - num_args, num_args};
 
@@ -447,13 +446,13 @@ inline bool invoke_function(const FuncType& func_type, const F& func, Instance&
     return true;
 }
 
-inline bool invoke_function(const FuncType& func_type, uint32_t func_idx, Instance& instance,
-    OperandStack& stack, int depth) noexcept
+inline bool invoke_function(
+    size_t num_args, uint32_t func_idx, Instance& instance, OperandStack& stack, int depth) noexcept
 {
     const auto func = [func_idx](Instance& _instance, span<const Value> args, int _depth) noexcept {
         return execute(_instance, func_idx, args.data(), _depth);
     };
-    return invoke_function(func_type, func, instance, stack, depth);
+    return invoke_function(num_args, func, instance, stack, depth);
 }
 }  // namespace
 
@@ -557,9 +556,10 @@ ExecutionResult execute(Instance& instance, FuncIdx func_idx, const Value* args,
         case Instr::call:
         {
             const auto called_func_idx = read<uint32_t>(immediates);
-            const auto& called_func_type = instance.module.get_function_type(called_func_idx);
+            const auto called_func_num_args =
+                instance.module.get_function_type(called_func_idx).inputs.size();
 
-            if (!invoke_function(called_func_type, called_func_idx, instance, stack, depth))
+            if (!invoke_function(called_func_num_args, called_func_idx, instance, stack, depth))
                 goto trap;
             break;
         }
@@ -584,7 +584,8 @@ ExecutionResult execute(Instance& instance, FuncIdx func_idx, const Value* args,
             if (expected_type != actual_type)
                 goto trap;
 
-            if (!invoke_function(actual_type, called_func->function, instance, stack, depth))
+            if (!invoke_function(
+                    actual_type.inputs.size(), called_func->function, instance, stack, depth))
                 goto trap;
             break;
         }