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

Fix test_wrapper linking bug

Browse source
This commit is contained in:
Brian Carroll 2021-11-17 16:45:38 +00:00
parent 751bfd842c
commit 1134b6f45c
2 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/test_gen/src/helpers/wasm.rs
View file

@ -98,11 +98,6 @@ pub fn helper_wasm<'a, T: Wasm32TestResult>(
// }
debug_assert_eq!(exposed_to_host.len(), 1);
let main_fn_symbol = loaded.entry_point.symbol;
let main_fn_index = procedures
.keys()
.position(|(s, _)| *s == main_fn_symbol)
.unwrap();
let exposed_to_host = exposed_to_host.keys().copied().collect::<MutSet<_>>();
@ -112,14 +107,10 @@ pub fn helper_wasm<'a, T: Wasm32TestResult>(
exposed_to_host,
};
let mut wasm_module = roc_gen_wasm::build_module_help(&env, procedures).unwrap();
let (mut wasm_module, main_fn_index) =
roc_gen_wasm::build_module_help(&env, procedures).unwrap();
T::insert_test_wrapper(
arena,
&mut wasm_module,
TEST_WRAPPER_NAME,
main_fn_index as u32,
);
T::insert_test_wrapper(arena, &mut wasm_module, TEST_WRAPPER_NAME, main_fn_index);
// We can either generate the test platform or write an external source file, whatever works
generate_test_platform(&mut wasm_module, arena);
@ -164,7 +155,7 @@ pub fn helper_wasm<'a, T: Wasm32TestResult>(
// write the module to a file so the linker can access it
std::fs::write(&app_o_file, &module_bytes).unwrap();
std::process::Command::new("zig")
let _linker_output = std::process::Command::new("zig")
.args(&[
"wasm-ld",
// input files
@ -190,6 +181,8 @@ pub fn helper_wasm<'a, T: Wasm32TestResult>(
.output()
.unwrap();
// dbg!(_linker_output);
Module::from_file(&store, &final_wasm_file).unwrap()
};