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

try to read the panic message in the callback

Browse source
This commit is contained in:
Brian Carroll 2022-07-09 20:39:02 +01:00 • committed by Folkert
parent 5a176ee93f
commit a8dcd38ef3
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
2 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -214,7 +214,26 @@ where
let mut module = rt.load_module(module).expect("Unable to load module");
let mut panic_msg: Option<String> = None;
module.link_wasi().unwrap();
module
.link_closure(
"env",
"send_panic_msg_to_rust",
|call_context, (msg_ptr, msg_len): (i32, i32)| {
let memory: &[u8] = unsafe {
let memory_ptr: *const [u8] = call_context.memory();
let (_, memory_size) = std::mem::transmute::<_, (usize, usize)>(memory_ptr);
std::slice::from_raw_parts(memory_ptr as _, memory_size)
};
let msg_bytes = &memory[msg_ptr as usize..][msg_len as usize..];
let msg = std::str::from_utf8(msg_bytes).unwrap();
panic_msg = Some(msg.into());
Ok(())
},
)
.expect("Unable to link roc_panic handler");
let test_wrapper = module
.find_function::<(), i32>(TEST_WRAPPER_NAME)
@ -222,16 +241,11 @@ where
match test_wrapper.call() {
Err(e) => {
let (_, memory_size) = unsafe { std::mem::transmute::<_, (usize, usize)>(rt.memory()) };
let memory: &[u8] =
unsafe { std::slice::from_raw_parts(rt.memory() as _, memory_size) };
// if let Some(msg) = get_roc_panic_msg(&instance, memory) {
// Err(format!("Roc failed with message: \"{}\"", msg))
// } else {
// Err(e.to_string())
// }
panic!("{:?}", &e);
if let Some(msg) = panic_msg {
Err(format!("Roc failed with message: \"{}\"", msg))
} else {
Err(format!("{}", e))
}
}
Ok(address) => {
// if false {

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

@ -123,17 +123,12 @@ void roc_dealloc(void *ptr, unsigned int alignment)
//--------------------------
// Allow the test to probe the panic message
extern char* panic_msg;
extern void send_panic_msg_to_rust(char* msg, int len) {
void roc_panic(char *msg, unsigned int tag_id)
{
panic_msg = msg;
// Note: no dynamic string formatting
fputs("Application crashed with message\n\n ", stderr);
fputs(msg, stderr);
fputs("\n\nShutting down\n", stderr);
int len = strlen(msg);
send_panic_msg_to_rust(msg, len);
exit(101);
}