language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-30 23:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

wasm: fix stack order in higher-order wrapper

Browse source
This commit is contained in:
Brian Carroll 2022-04-02 23:59:22 +01:00
parent b1f15799e3
commit a63e55e023
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/gen_wasm/src/backend.rs
View file

@ -319,11 +319,17 @@ impl<'a> WasmBackend<'a> {
let mut n_inner_wasm_args = 0; let mut n_inner_wasm_args = 0;
let ret_type_and_size = match inner_ret_layout.return_method() { let ret_type_and_size = match inner_ret_layout.return_method() {
ReturnMethod::Primitive(ty, size) => Some((ty, size)),
ReturnMethod::NoReturnValue => None, ReturnMethod::NoReturnValue => None,
ReturnMethod::WriteToPointerArg => { ReturnMethod::Primitive(ty, size) => {
n_inner_wasm_args += 1; // If the inner function returns a primitive, load the address to store it at
// After the call, it will be under the call result in the value stack
self.code_builder.get_local(heap_return_ptr_id); self.code_builder.get_local(heap_return_ptr_id);
Some((ty, size))
}
ReturnMethod::WriteToPointerArg => {
// If the inner function writes to a return pointer, load its address
self.code_builder.get_local(heap_return_ptr_id);
n_inner_wasm_args += 1;
None None
} }
}; };
@ -378,11 +384,6 @@ impl<'a> WasmBackend<'a> {
self.code_builder.get_local(LocalId(0)); self.code_builder.get_local(LocalId(0));
} }
// If the inner function returns a primitive, load the address to store it at
if ret_type_and_size.is_some() {
self.code_builder.get_local(heap_return_ptr_id);
}
// Call the wrapped inner function // Call the wrapped inner function
let lookup = &self.proc_lookup[inner_lookup_idx]; let lookup = &self.proc_lookup[inner_lookup_idx];
let inner_wasm_fn_index = self.fn_index_offset + inner_lookup_idx as u32; let inner_wasm_fn_index = self.fn_index_offset + inner_lookup_idx as u32;
@ -394,7 +395,7 @@ impl<'a> WasmBackend<'a> {
has_return_val, has_return_val,
); );
// If the inner function returns a primitive, store it to the address we loaded earlier // If the inner function returns a primitive, store it to the address we loaded at the very beginning
if let Some((ty, size)) = ret_type_and_size { if let Some((ty, size)) = ret_type_and_size {
match (ty, size) { match (ty, size) {
(I64, 8) => self.code_builder.i64_store(Bytes8, 0), (I64, 8) => self.code_builder.i64_store(Bytes8, 0),

2
compiler/test_gen/src/gen_primitives.rs
View file

@ -1074,7 +1074,7 @@ fn closure_in_list() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(any(feature = "gen-llvm", feature = "gen-wasm"))]
fn specialize_closure() { fn specialize_closure() {
use roc_std::RocList; use roc_std::RocList;