fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-06-12 04:21:21 +00:00
Code Issues Projects Releases Wiki Activity

Communicate exceptions through global memory

Browse Source 
Instead of allocating space on the stack and returning a pointer we
should be able to use a single global memory location to communicate
this error payload information. This shouldn't run into any reentrancy
issues since it's only stored just before returning to wasm and it's
always read just after returning from wasm.
This commit is contained in:
Alex Crichton
2019-06-11 11:39:48 -07:00
parent 535aa3193c
commit 6796bc6895
4 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
crates/cli-support/src/js/mod.rs
View File

@ -1419,16 +1419,14 @@ impl<'a> Context<'a> {
if !self.should_write_global("handle_error") {
return Ok(());
}
self.expose_uint32_memory();
self.require_internal_export("__wbindgen_exn_store")?;
if self.config.anyref {
self.expose_add_to_anyref_table()?;
self.global(
"
function handleError(exnptr, e) {
function handleError(e) {
const idx = addToAnyrefTable(e);
const view = getUint32Memory();
view[exnptr / 4] = 1;
view[exnptr / 4 + 1] = idx;
wasm.__wbindgen_exn_store(idx);
}
",
);
@ -1436,10 +1434,8 @@ impl<'a> Context<'a> {
self.expose_add_heap_object();
self.global(
"
function handleError(exnptr, e) {
const view = getUint32Memory();
view[exnptr / 4] = 1;
view[exnptr / 4 + 1] = addHeapObject(e);
function handleError(e) {
wasm.__wbindgen_exn_store(addHeapObject(e));
}
",
);
@ -2115,7 +2111,7 @@ impl<'a> Context<'a> {
fn export_function_table(&mut self) -> Result<(), Error> {
if !self.should_write_global("wbg-function-table") {
return Ok(())
return Ok(());
}
let id = match self.module.tables.main_function_table()? {
Some(id) => id,
@ -2192,7 +2188,7 @@ impl ExportedClass {
field: &str,
js: &str,
prefix: &str,
ret_ty: &str
ret_ty: &str,
) -> &mut bool {
self.contents.push_str(docs);
self.contents.push_str(prefix);
@ -2215,7 +2211,8 @@ impl ExportedClass {
/// generated output is deterministic and we do so by ensuring that iteration of
/// hash maps is consistently sorted.
fn sorted_iter<K, V>(map: &HashMap<K, V>) -> impl Iterator<Item = (&K, &V)>
where K: Ord,
where
K: Ord,
{
let mut pairs = map.iter().collect::<Vec<_>>();
pairs.sort_by_key(|(k, _)| *k);

8
crates/cli-support/src/js/rust2js.rs
View File

@ -928,7 +928,7 @@ impl<'a, 'b> Rust2Js<'a, 'b> {
try {{\n\
{}
}} catch (e) {{\n\
handleError(exnptr, e);\n\
handleError(e);\n\
}}\
",
&invoc
@ -973,12 +973,6 @@ impl<'a, 'b> Rust2Js<'a, 'b> {
let mut ret = String::new();
ret.push_str("function(");
ret.push_str(&self.shim_arguments.join(", "));
if self.catch {
if self.shim_arguments.len() > 0 {
ret.push_str(", ")
}
ret.push_str("exnptr");
}
ret.push_str(") {\n");
ret.push_str(&self.prelude);