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

Merge branch 'trunk' of github.com:rtfeldman/roc into wasm-runtime-error

Browse source
This commit is contained in:
Brian Carroll 2022-02-27 22:57:23 +00:00
commit 7ccc5ec768
337 changed files with 17368 additions and 5923 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,6 @@ use std::path::{Path, PathBuf};
use wasmer::{Memory, WasmPtr};
use crate::helpers::from_wasmer_memory::FromWasmerMemory;
use roc_can::builtins::builtin_defs_map;
use roc_collections::all::{MutMap, MutSet};
use roc_gen_wasm::wasm32_result::Wasm32Result;
use roc_gen_wasm::{DEBUG_LOG_SETTINGS, MEMORY_NAME};
@ -95,7 +94,6 @@ fn compile_roc_to_wasm_bytes<'a, T: Wasm32Result>(
src_dir,
exposed_types,
roc_target::TargetInfo::default_wasm32(),
builtin_defs_map,
);
let loaded = loaded.expect("failed to load module");
@ -209,10 +207,7 @@ where
Err(_) => Err(format!("{}", e)),
},
Ok(result) => {
let address = match result[0] {
wasmer::Value::I32(a) => a,
_ => panic!(),
};
let address = result[0].unwrap_i32();
if false {
println!("test_wrapper returned 0x{:x}", address);
@ -283,10 +278,7 @@ where
let init_result = init_refcount_test.call(&[wasmer::Value::I32(expected_len)]);
let refcount_vector_addr = match init_result {
Err(e) => return Err(format!("{:?}", e)),
Ok(result) => match result[0] {
wasmer::Value::I32(a) => a,
_ => panic!(),
},
Ok(result) => result[0].unwrap_i32(),
};
// Run the test