language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-04 04:08:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

RocStr roc_panic for wasm gen

Browse source
This commit is contained in:
Ayaz Hafiz 2022-11-22 15:09:59 -06:00
parent 2b49aee3d2
commit d33985db92
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
3 changed files with 29 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/compiler/test_gen/src/helpers/wasm.rs
View file

@ -5,6 +5,7 @@ use roc_gen_wasm::wasm32_result::Wasm32Result;
use roc_gen_wasm::DEBUG_SETTINGS;
use roc_load::{ExecutionMode, LoadConfig, Threading};
use roc_reporting::report::DEFAULT_PALETTE_HTML;
use roc_std::RocStr;
use roc_wasm_module::{Export, ExportType};
use std::marker::PhantomData;
use std::path::PathBuf;
@ -193,7 +194,7 @@ where
let parsed = Module::parse(&env, &wasm_bytes[..]).expect("Unable to parse module");
let mut module = rt.load_module(parsed).expect("Unable to load module");
let panic_msg: Rc<Mutex<Option<(i32, i32)>>> = Default::default();
let panic_msg: Rc<Mutex<Option<i32>>> = Default::default();
link_module(&mut module, panic_msg.clone());
let test_wrapper = module
@ -202,10 +203,9 @@ where
match test_wrapper.call() {
Err(e) => {
if let Some((msg_ptr, msg_len)) = *panic_msg.lock().unwrap() {
if let Some(msg_ptr) = *panic_msg.lock().unwrap() {
let memory: &[u8] = get_memory(&rt);
let msg_bytes = &memory[msg_ptr as usize..][..msg_len as usize];
let msg = std::str::from_utf8(msg_bytes).unwrap();
let msg = RocStr::decode(memory, msg_ptr as _);
Err(format!("Roc failed with message: \"{}\"", msg))
} else {
@ -253,7 +253,7 @@ where
let parsed = Module::parse(&env, wasm_bytes).expect("Unable to parse module");
let mut module = rt.load_module(parsed).expect("Unable to load module");
let panic_msg: Rc<Mutex<Option<(i32, i32)>>> = Default::default();
let panic_msg: Rc<Mutex<Option<i32>>> = Default::default();
link_module(&mut module, panic_msg.clone());
let expected_len = num_refcounts as i32;
@ -316,13 +316,13 @@ fn read_i32(memory: &[u8], ptr: usize) -> i32 {
i32::from_le_bytes(bytes)
}
fn link_module(module: &mut Module, panic_msg: Rc<Mutex<Option<(i32, i32)>>>) {
fn link_module(module: &mut Module, panic_msg: Rc<Mutex<Option<i32>>>) {
let try_link_panic = module.link_closure(
"env",
"send_panic_msg_to_rust",
move |_call_context, args: (i32, i32)| {
move |_call_context, msg_ptr: i32| {
let mut w = panic_msg.lock().unwrap();
*w = Some(args);
*w = Some(msg_ptr);
Ok(())
},
);

7
crates/compiler/test_gen/src/helpers/wasm_test_platform.c
View file

@ -123,12 +123,11 @@ void roc_dealloc(void *ptr, unsigned int alignment)
//--------------------------
extern void send_panic_msg_to_rust(char* msg, int len);
extern void send_panic_msg_to_rust(void* msg);
void roc_panic(char *msg, unsigned int tag_id)
void roc_panic(void* msg, unsigned int tag_id)
{
int len = strlen(msg);
send_panic_msg_to_rust(msg, len);
send_panic_msg_to_rust(msg);
exit(101);
}