Remove type from TableElement

wasmx · Oct 21, 2020 · 89c28dc · 89c28dc
1 parent b250510
commit 89c28dc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/fizzy/execute.cpp b/lib/fizzy/execute.cpp
@@ -629,7 +629,8 @@ ExecutionResult execute(Instance& instance, FuncIdx func_idx, const Value* args,
                 goto trap;
 
             // check actual type against expected type
-            const auto& actual_type = called_func->type;
+            const auto& actual_type =
+                called_func->instance->module->get_function_type(called_func->func_idx);
             const auto& expected_type = instance.module->typesec[expected_type_idx];
             if (expected_type != actual_type)
                 goto trap;

diff --git a/lib/fizzy/instantiate.cpp b/lib/fizzy/instantiate.cpp
@@ -330,7 +330,7 @@ std::unique_ptr<Instance> instantiate(std::unique_ptr<const Module> module,
         auto it_table = instance->table->begin() + elementsec_offsets[i];
         for (const auto idx : instance->module->elementsec[i].init)
         {
-            *it_table++ = {instance.get(), idx, instance->module->get_function_type(idx), {}};
+            *it_table++ = {instance.get(), idx, {}};
         }
     }
 

diff --git a/lib/fizzy/instantiate.hpp b/lib/fizzy/instantiate.hpp
@@ -32,7 +32,6 @@ struct TableElement
 {
     Instance* instance;
     FuncIdx func_idx;
-    FuncType type;
     std::shared_ptr<Instance> shared_instance;
 };