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

Fix malloc in wasm by setting __heap_end

Browse source
This commit is contained in:
Brendan Hansknecht 2023-10-22 15:44:08 -07:00
parent 7b311dff0e
commit 6665a0ea4f
No known key found for this signature in database
GPG key ID: 0EA784685083E75B
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/compiler/gen_wasm/src/backend.rs
View file

@ -89,7 +89,8 @@ impl<'a, 'r> WasmBackend<'a, 'r> {
fn_index_offset: u32,
helper_proc_gen: CodeGenHelp<'a>,
) -> Self {
let can_relocate_heap = module.linking.find_internal_symbol("__heap_base").is_ok();
let can_relocate_heap = module.linking.find_internal_symbol("__heap_base").is_ok()
&& module.linking.find_internal_symbol("__heap_end").is_ok();
// We don't want to import any Memory or Tables
module.import.imports.retain(|import| {
@ -211,6 +212,12 @@ impl<'a, 'r> WasmBackend<'a, 'r> {
self.module
.relocate_internal_symbol("__heap_base", stack_heap_boundary)
.unwrap();
self.module
.relocate_internal_symbol(
"__heap_end",
stack_heap_boundary + MemorySection::PAGE_SIZE,
)
.unwrap();
}
}
@ -219,7 +226,9 @@ impl<'a, 'r> WasmBackend<'a, 'r> {
fn export_globals(&mut self) {
for (sym_index, sym) in self.module.linking.symbol_table.iter().enumerate() {
match sym {
SymInfo::Data(DataSymbol::Imported { name, .. }) if *name != "__heap_base" => {
SymInfo::Data(DataSymbol::Imported { name, .. })
if *name != "__heap_base" && *name != "__heap_end" =>
{
let global_value_addr = self.module.data.end_addr;
self.module.data.end_addr += PTR_SIZE;