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

wasm: go back to custom bytes->string transformation

Browse source 
CStr version is too hard to get working correctly. I get weird test failures
with random characters in the middle of strings.
This commit is contained in:
Brian Carroll 2022-03-04 19:51:58 +00:00
parent 20e46fbda4
commit 338961d202
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,6 @@
use core::cell::Cell;
use libc::c_char;
use roc_gen_wasm::wasm_module::{Export, ExportType};
use std::collections::hash_map::DefaultHasher;
use std::ffi::CStr;
use std::hash::{Hash, Hasher};
use std::marker::PhantomData;
use std::path::{Path, PathBuf};
@ -238,10 +236,13 @@ fn get_roc_panic_msg(instance: &wasmer::Instance, memory: &Memory) -> Option<Str
return None;
}
let msg_index = msg_addr as usize;
let msg_ptr = memory_bytes[msg_index..].as_ptr();
let msg_cstr = unsafe { CStr::from_ptr(msg_ptr as *const c_char) };
let msg_str = msg_cstr.to_str().unwrap();
Some(msg_str.to_string())
let msg_len = memory_bytes[msg_index..]
.iter()
.position(|c| *c == 0)
.unwrap();
let msg_bytes = memory_bytes[msg_index..][..msg_len].to_vec();
let msg = unsafe { String::from_utf8_unchecked(msg_bytes) };
Some(msg)
}
#[allow(dead_code)]