From 642a3d591ec50838e29571cc7e749d76ba70dc06 Mon Sep 17 00:00:00 2001
From: Andrei Maiboroda <andrei@ethereum.org>
Date: Mon, 30 May 2022 16:48:57 +0200
Subject: [PATCH] Remove extra branch in invoke_function with metering disabled

---
 lib/fizzy/execute.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/fizzy/execute.cpp b/lib/fizzy/execute.cpp
index b69ea286f..ef7d7d61e 100644
--- a/lib/fizzy/execute.cpp
+++ b/lib/fizzy/execute.cpp
@@ -525,6 +525,11 @@ void branch(const Code& code, OperandStack& stack, const uint8_t*& pc, uint32_t
         stack.drop(stack_drop);
 }
 
+template <bool MeteringEnabled>
+ExecutionResult execute(
+    Instance& instance, FuncIdx func_idx, const Value* args, ExecutionContext& ctx) noexcept;
+
+template <bool MeteringEnabled>
 inline bool invoke_function(const FuncType& func_type, uint32_t func_idx, Instance& instance,
     OperandStack& stack, ExecutionContext& ctx) noexcept
 {
@@ -532,7 +537,7 @@ inline bool invoke_function(const FuncType& func_type, uint32_t func_idx, Instan
     assert(stack.size() >= num_args);
     const auto call_args = stack.rend() - num_args;
 
-    const auto ret = execute(instance, func_idx, call_args, ctx);
+    const auto ret = execute<MeteringEnabled>(instance, func_idx, call_args, ctx);
     // Bubble up traps
     if (ret.trapped)
         return false;
@@ -657,7 +662,8 @@ ExecutionResult execute(
             const auto called_func_idx = read<uint32_t>(pc);
             const auto& called_func_type = instance.module->get_function_type(called_func_idx);
 
-            if (!invoke_function(called_func_type, called_func_idx, instance, stack, ctx))
+            if (!invoke_function<MeteringEnabled>(
+                    called_func_type, called_func_idx, instance, stack, ctx))
                 goto trap;
             break;
         }
@@ -683,7 +689,7 @@ ExecutionResult execute(
             if (expected_type != actual_type)
                 goto trap;
 
-            if (!invoke_function(
+            if (!invoke_function<MeteringEnabled>(
                     actual_type, called_func.func_idx, *called_func.instance, stack, ctx))
                 goto trap;
             break;