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

cleanup gen_refcount and add new test based on map2

Browse source
This commit is contained in:
Brendan Hansknecht 2024-07-11 15:29:44 -07:00
parent 9a020100a9
commit b28e6b343a
No known key found for this signature in database
GPG key ID: 0EA784685083E75B
4 changed files with 107 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
use super::RefCount;
use super::{RefCount, RefCountLoc};
use crate::helpers::from_wasm32_memory::FromWasm32Memory;
use bumpalo::Bump;
use roc_collections::all::MutSet;
@ -258,7 +258,7 @@ where
pub fn assert_wasm_refcounts_help<T>(
src: &str,
phantom: PhantomData<T>,
num_refcounts: usize,
refcount_locs: &[RefCountLoc],
) -> Result<Vec<RefCount>, String>
where
T: FromWasm32Memory + Wasm32Result,
@ -278,6 +278,7 @@ where
let mut inst = Instance::for_module(&arena, &module, dispatcher, is_debug_mode)?;
// Allocate a vector in the test host that refcounts will be copied into
let num_refcounts = refcount_locs.len();
let mut refcount_vector_addr: i32 = inst
.call_export(INIT_REFCOUNT_NAME, [Value::I32(num_refcounts as i32)])?
.ok_or_else(|| format!("No return address from {}", INIT_REFCOUNT_NAME))?
@ -302,22 +303,21 @@ where
// Read the refcounts
let mut refcounts = Vec::with_capacity(num_refcounts);
for _ in 0..num_refcounts {
for refcount_loc in refcount_locs {
// Get the next RC pointer from the host's vector
refcount_vector_addr += 4;
let rc_ptr = read_i32(&inst.memory, refcount_vector_addr);
let mut rc_ptr = read_i32(&inst.memory, refcount_vector_addr);
let rc = if rc_ptr == 0 {
RefCount::Deallocated
} else {
// Dereference the RC pointer and decode its value from the negative number format
let mut rc_encoded = read_i32(&inst.memory, rc_ptr);
if rc_encoded > 0 {
// We happen to be reading a list that is refcounted.
// This is the size on heap.
// Shift over 4 to and load the real RC.
rc_encoded = read_i32(&inst.memory, rc_ptr + 4);
// If size is store on the heap for this type, the rc pointer is directly after.
if matches!(refcount_loc, RefCountLoc::AfterSize) {
rc_ptr += 4
}
// Dereference the RC pointer and decode its value from the negative number format
let rc_encoded = read_i32(&inst.memory, rc_ptr);
if rc_encoded == 0 {
RefCount::Constant
} else {
@ -404,15 +404,18 @@ macro_rules! assert_refcounts {
// We need the result type to generate the test_wrapper, even though we ignore the value!
// We can't just call `main` with no args, because some tests return structs, via pointer arg!
// Also we need to know how much stack space to reserve for the struct.
($src: expr, $ty: ty, $expected_refcounts: expr) => {{
($src: expr, $ty: ty, $expected: expr) => {{
let phantom = std::marker::PhantomData;
let num_refcounts = $expected_refcounts.len();
let (refcount_locs, expected_refcounts): (
Vec<$crate::helpers::RefCountLoc>,
Vec<$crate::helpers::RefCount>,
) = $expected.into_iter().map(|x| *x).unzip();
let result =
$crate::helpers::wasm::assert_wasm_refcounts_help::<$ty>($src, phantom, num_refcounts);
$crate::helpers::wasm::assert_wasm_refcounts_help::<$ty>($src, phantom, &refcount_locs);
match result {
Err(msg) => panic!("{:?}", msg),
Ok(actual_refcounts) => {
assert_eq!(&actual_refcounts, $expected_refcounts)
assert_eq!(actual_refcounts, expected_refcounts)
}
}
}};