Merge branch 'master' into fix/create-exe-genearted-code-bugs

This commit is contained in:
Mark McCaskey
2020-10-19 10:03:05 -07:00
committed by GitHub
57 changed files with 672 additions and 591 deletions

View File

@@ -136,21 +136,25 @@ int main(int argc, char* argv[]) {
wasm_importtype_vec_t import_types;
wasm_module_imports(module, &import_types);
int num_imports = import_types.size;
wasm_extern_t** imports = (wasm_extern_t**) malloc(num_imports * sizeof(wasm_extern_t*));
wasm_extern_vec_t imports;
wasm_extern_vec_new_uninitialized(&imports, import_types.size);
wasm_importtype_vec_delete(&import_types);
#ifdef WASI
bool get_imports_result = wasi_get_imports(store, module, wasi_env, imports);
bool get_imports_result = wasi_get_imports(store, module, wasi_env, &imports);
if (!get_imports_result) {
fprintf(stderr, "Error getting WASI imports!\n");
print_wasmer_error();
return 1;
}
#endif
wasm_instance_t* instance = wasm_instance_new(store, module, (const wasm_extern_t* const*) imports, NULL);
if (! instance) {
wasm_instance_t* instance = wasm_instance_new(store, module, &imports, NULL);
if (!instance) {
fprintf(stderr, "Failed to create instance\n");
print_wasmer_error();
return -1;