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

wasm_interp: If called function is not found in exports, look in name section too

Browse source
This commit is contained in:
Brian Carroll 2022-12-11 11:52:19 +00:00
parent 473dd371b0
commit 3d5edf57fc
No known key found for this signature in database
GPG key ID: 5C7B2EC4101703C0
1 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/wasm_interp/src/instance.rs
View file

@ -198,6 +198,7 @@ impl<'a, I: ImportDispatcher> Instance<'a, I> {
let fn_index = {
let mut export_iter = module.export.exports.iter();
export_iter
// First look up the name in exports
.find_map(|ex| {
if ex.ty == ExportType::Func && ex.name == fn_name {
Some(ex.index)
@ -205,10 +206,27 @@ impl<'a, I: ImportDispatcher> Instance<'a, I> {
None
}
})
.ok_or(format!(
"I couldn't find an exported function '{}' in this WebAssembly module",
.or_else(|| {
// Then look it up in the debug info!
// This is non-spec behaviour that Wasm3 seems to implement,
// and that our wasm_linking tests accidentally rely on!
let mut names = module.names.function_names.iter();
names.find_map(
|(index, name)| {
if *name == fn_name {
Some(*index)
} else {
None
}
},
)
})
.ok_or_else(|| {
format!(
"I couldn't find a function '{}' in this WebAssembly module",
fn_name
))?
)
})?
};
self.program_counter = {