refactor: move copying instantiate to test/utils/instantiate_helpers.hpp

Author: gumb0

lib/fizzy/instantiate.cpp

@@ -373,16 +373,6 @@ std::unique_ptr<Instance> instantiate(std::unique_ptr<Module> module,
     return instance;
 }
 
-std::unique_ptr<Instance> instantiate(Module module,
-    std::vector<ExternalFunction> imported_functions, std::vector<ExternalTable> imported_tables,
-    std::vector<ExternalMemory> imported_memories, std::vector<ExternalGlobal> imported_globals,
-    uint32_t memory_pages_limit)
-{
-    return instantiate(std::make_unique<Module>(std::move(module)), std::move(imported_functions),
-        std::move(imported_tables), std::move(imported_memories), std::move(imported_globals),
-        memory_pages_limit);
-}
-
 std::vector<ExternalFunction> resolve_imported_functions(
     const Module& module, std::vector<ImportedFunction> imported_functions)
 {

lib/fizzy/instantiate.hpp

@@ -94,14 +94,6 @@ std::unique_ptr<Instance> instantiate(std::unique_ptr<Module> module,
     std::vector<ExternalGlobal> imported_globals = {},
     uint32_t memory_pages_limit = DefaultMemoryPagesLimit);
 
-// Instantiate a module.
-std::unique_ptr<Instance> instantiate(Module _module,
-    std::vector<ExternalFunction> imported_functions = {},
-    std::vector<ExternalTable> imported_tables = {},
-    std::vector<ExternalMemory> imported_memories = {},
-    std::vector<ExternalGlobal> imported_globals = {},
-    uint32_t memory_pages_limit = DefaultMemoryPagesLimit);
-
 // Function that should be used by instantiate as imports, identified by module and function name.
 struct ImportedFunction
 {

test/spectests/spectests.cpp

@@ -89,7 +89,8 @@ class test_runner
     explicit test_runner(const test_settings& ts)
       : m_settings{ts}, m_registered_names{{spectest_name, spectest_name}}
     {
-        m_instances[spectest_name] = fizzy::instantiate(*spectest_module);
+        m_instances[spectest_name] =
+            fizzy::instantiate(std::make_unique<fizzy::Module>(*spectest_module));
     }
 
     test_results run_from_file(const fs::path& path)

test/unittests/api_test.cpp

@@ -8,6 +8,7 @@
 #include <lib/fizzy/limits.hpp>
 #include <test/utils/asserts.hpp>
 #include <test/utils/hex.hpp>
+#include <test/utils/instantiate_helpers.hpp>
 
 using namespace fizzy;
 using namespace fizzy::test;

test/unittests/end_to_end_test.cpp

@@ -7,6 +7,7 @@
 #include <gtest/gtest.h>
 #include <test/utils/asserts.hpp>
 #include <test/utils/hex.hpp>
+#include <test/utils/instantiate_helpers.hpp>
 
 using namespace fizzy;
 using namespace fizzy::test;

test/unittests/execute_floating_point_test.cpp

@@ -10,6 +10,7 @@
 #include <test/utils/asserts.hpp>
 #include <test/utils/floating_point_utils.hpp>
 #include <test/utils/hex.hpp>
+#include <test/utils/instantiate_helpers.hpp>
 #include <array>
 #include <cfenv>
 #include <cmath>

test/unittests/instantiate_test.cpp

@@ -8,6 +8,7 @@
 #include <gtest/gtest.h>
 #include <test/utils/asserts.hpp>
 #include <test/utils/hex.hpp>
+#include <test/utils/instantiate_helpers.hpp>
 
 using namespace fizzy;
 using namespace fizzy::test;

test/utils/CMakeLists.txt

@@ -18,6 +18,7 @@ target_sources(
     floating_point_utils.hpp
     hex.cpp
     hex.hpp
+    instantiate_helpers.hpp
     leb128_encode.cpp
     leb128_encode.hpp
     wabt_engine.cpp

test/utils/execute_helpers.hpp

@@ -5,6 +5,7 @@
 #pragma once
 
 #include "execute.hpp"
+#include <test/utils/instantiate_helpers.hpp>
 #include <initializer_list>
 
 namespace fizzy::test

test/utils/instantiate_helpers.hpp

@@ -0,0 +1,22 @@
+// Fizzy: A fast WebAssembly interpreter
+// Copyright 2020 The Fizzy Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include "instantiate.hpp"
+
+namespace fizzy::test
+{
+inline std::unique_ptr<Instance> instantiate(Module module,
+    std::vector<ExternalFunction> imported_functions = {},
+    std::vector<ExternalTable> imported_tables = {},
+    std::vector<ExternalMemory> imported_memories = {},
+    std::vector<ExternalGlobal> imported_globals = {},
+    uint32_t memory_pages_limit = DefaultMemoryPagesLimit)
+{
+    return instantiate(std::make_unique<Module>(std::move(module)), std::move(imported_functions),
+        std::move(imported_tables), std::move(imported_memories), std::move(imported_globals),
+        memory_pages_limit);
+}
+}  // namespace fizzy::test