fix

Signed-off-by: mathetake <[email protected]>

Author: mathetake

src/wasmtime/types.h

@@ -39,23 +39,6 @@ using WasmExportTypeVec = common::DeleterType<wasm_exporttype_vec_t, wasm_export
 using WasmExternVec = common::DeleterType<wasm_extern_vec_t, wasm_extern_vec_delete>;
 using WasmValtypeVec = common::DeleterType<wasm_valtype_vec_t, wasm_valtype_vec_delete>;
 
-class WasmExternPtrVector {
-public:
-  ~WasmExternPtrVector() {
-    // TODO: come back later
-    for (auto it = vector.begin(); it < vector.end(); it++) {
-      //      wasm_extern_delete(*it);
-    }
-  }
-
-  wasm_extern_t **data() { return vector.data(); }
-  void push_back(wasm_extern_t *item) { vector.push_back(item); }
-  size_t size() { return vector.size(); }
-
-private:
-  std::vector<wasm_extern_t *> vector;
-};
-
 } // namespace wasmtime
 
 } // namespace proxy_wasm

src/wasmtime/wasmtime.cc

@@ -198,7 +198,7 @@ bool Wasmtime::link(std::string_view debug_name) {
   WasmImporttypeVec import_types;
   wasm_module_imports(module_.get(), import_types.get());
 
-  WasmExternPtrVector imports;
+  std::vector<const wasm_extern_t *> imports;
   for (size_t i = 0; i < import_types.get()->size; i++) {
     const wasm_name_t *module_name_ptr = wasm_importtype_module(import_types.get()->data[i]);
     const wasm_name_t *name_ptr = wasm_importtype_name(import_types.get()->data[i]);
@@ -233,7 +233,7 @@ bool Wasmtime::link(std::string_view debug_name) {
                 " -> " + printValTypes(wasm_functype_results(actual_type.get())));
         break;
       }
-      imports.push_back(wasm_func_as_extern(func));
+      imports.push_back(wasm_func_as_extern_const(func));
     } break;
     case WASM_EXTERN_GLOBAL: {
       // TODO(mathetake): add support when/if needed.
@@ -246,14 +246,14 @@ bool Wasmtime::link(std::string_view debug_name) {
       const wasm_memorytype_t *memory_type =
           wasm_externtype_as_memorytype_const(extern_type); // owned by `extern_type`
       memory_ = wasm_memory_new(store_.get(), memory_type);
-      imports.push_back(wasm_memory_as_extern(memory_.get()));
+      imports.push_back(wasm_memory_as_extern_const(memory_.get()));
     } break;
     case WASM_EXTERN_TABLE: {
       assert(table_ == nullptr);
       const wasm_tabletype_t *table_type =
           wasm_externtype_as_tabletype_const(extern_type); // owned by `extern_type`
       table_ = wasm_table_new(store_.get(), table_type, nullptr);
-      imports.push_back(wasm_table_as_extern(table_.get()));
+      imports.push_back(wasm_table_as_extern_const(table_.get()));
     } break;
     }
   }
@@ -279,9 +279,10 @@ bool Wasmtime::link(std::string_view debug_name) {
     assert(kind == wasm_externtype_kind(exp_extern_type));
     switch (kind) {
     case WASM_EXTERN_FUNC: {
-      wasm_func_t *func = wasm_func_copy(wasm_extern_as_func(actual_extern));
+      WasmFuncPtr func = wasm_func_copy(wasm_extern_as_func(actual_extern));
       const wasm_name_t *name_ptr = wasm_exporttype_name(export_types.get()->data[i]);
-      module_functions_.insert_or_assign(std::string(name_ptr->data, name_ptr->size), func);
+      module_functions_.insert_or_assign(std::string(name_ptr->data, name_ptr->size),
+                                         std::move(func));
     } break;
     case WASM_EXTERN_GLOBAL: {
       // TODO(mathetake): add support when/if needed.