language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 14:54:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix test code gen

Browse source
This commit is contained in:
Brian Carroll 2021-10-24 23:34:14 +02:00
parent 6534da5055
commit c46e73bd64
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/gen_wasm/tests/helpers/eval.rs
View file

@ -4,6 +4,7 @@ use std::hash::{Hash, Hasher};
use roc_can::builtins::builtin_defs_map; use roc_can::builtins::builtin_defs_map;
use roc_collections::all::{MutMap, MutSet}; use roc_collections::all::{MutMap, MutSet};
use roc_gen_wasm::replace_code_section;
// use roc_std::{RocDec, RocList, RocOrder, RocStr}; // use roc_std::{RocDec, RocList, RocOrder, RocStr};
use crate::helpers::wasm32_test_result::Wasm32TestResult; use crate::helpers::wasm32_test_result::Wasm32TestResult;
use roc_gen_wasm::from_wasm32_memory::FromWasm32Memory; use roc_gen_wasm::from_wasm32_memory::FromWasm32Memory;
@ -113,7 +114,9 @@ pub fn helper_wasm<'a, T: Wasm32TestResult>(
main_function_index, main_function_index,
); );
let module_bytes = builder.build().into_bytes().unwrap(); let mut parity_module = builder.build();
replace_code_section(&mut parity_module, code_section_bytes);
let module_bytes = parity_module.into_bytes().unwrap();
// for debugging (e.g. with wasm2wat) // for debugging (e.g. with wasm2wat)
if true { if true {
@ -145,7 +148,7 @@ pub fn helper_wasm<'a, T: Wasm32TestResult>(
let store = Store::default(); let store = Store::default();
// let module = Module::from_file(&store, &test_wasm_path).unwrap(); // let module = Module::from_file(&store, &test_wasm_path).unwrap();
let module = Module::from_binary(&store, &module_bytes).unwrap(); let wasmer_module = Module::from_binary(&store, &module_bytes).unwrap();
// First, we create the `WasiEnv` // First, we create the `WasiEnv`
use wasmer_wasi::WasiState; use wasmer_wasi::WasiState;
@ -154,10 +157,10 @@ pub fn helper_wasm<'a, T: Wasm32TestResult>(
// Then, we get the import object related to our WASI // Then, we get the import object related to our WASI
// and attach it to the Wasm instance. // and attach it to the Wasm instance.
let import_object = wasi_env let import_object = wasi_env
.import_object(&module) .import_object(&wasmer_module)
.unwrap_or_else(|_| wasmer::imports!()); .unwrap_or_else(|_| wasmer::imports!());
Instance::new(&module, &import_object).unwrap() Instance::new(&wasmer_module, &import_object).unwrap()
} }
#[allow(dead_code)] #[allow(dead_code)]