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

use Rc<Mutex<>> to work around lifetime issues

Browse source
This commit is contained in:
Folkert 2022-07-09 22:00:26 +02:00
parent eb90af7e0d
commit 3ce8527ec1
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,11 +5,12 @@ use roc_gen_wasm::wasm32_result::Wasm32Result;
use roc_gen_wasm::wasm_module::{Export, ExportType};
use roc_gen_wasm::{DEBUG_SETTINGS, MEMORY_NAME};
use roc_load::Threading;
use std::cell::Cell;
use std::collections::hash_map::DefaultHasher;
use std::hash::{Hash, Hasher};
use std::marker::PhantomData;
use std::path::{Path, PathBuf};
use std::rc::Rc;
use std::sync::Mutex;
use wasmer::{Memory, WasmPtr};
// Should manually match build.rs
@ -215,16 +216,17 @@ where
let mut module = rt.load_module(module).expect("Unable to load module");
let panic_msg = Cell::<Option<(i32, i32)>>::new(None);
let panic_msg: Rc<Mutex<Option<(i32, i32)>>> = Default::default();
let panic_msg_for_closure = panic_msg.clone();
module.link_wasi().unwrap();
module
.link_closure(
"env",
"send_panic_msg_to_rust",
|_call_context, args: (i32, i32)| {
let swappy = Cell::new(Some(args));
panic_msg.swap(&swappy);
move |_call_context, args: (i32, i32)| {
let mut w = panic_msg_for_closure.lock().unwrap();
*w = Some(args);
Ok(())
},
)
@ -236,7 +238,7 @@ where
match test_wrapper.call() {
Err(e) => {
if let Some((msg_ptr, msg_len)) = panic_msg.into_inner() {
if let Some((msg_ptr, msg_len)) = *panic_msg.lock().unwrap() {
let memory: &[u8] = unsafe {
let memory_ptr: *const [u8] = rt.memory();
let (_, memory_size) = std::mem::transmute::<_, (usize, usize)>(memory_ptr);