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

Fix consuming a struct and returning a slice

Browse Source 
This came up in a [recent comment][1] and it turns out we're accidentally
generating two `const ptr = ...` declarations, invalid JS! While Node doesn't
catch this it looks like firefox does.

[1]: https://github.com/rustwasm/wasm-bindgen/issues/329#issuecomment-411082013
This commit is contained in:
Alex Crichton
2018-08-07 07:53:30 -07:00
parent b6a6dee7f1
commit 0d18c8c397
3 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/cli-support/src/js/js2rust.rs
View File

@ -417,16 +417,16 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
"\
RET;\n\
const mem = getUint32Memory();\n\
const ptr = mem[retptr / 4];\n\
const len = mem[retptr / 4 + 1];\n\
const rustptr = mem[retptr / 4];\n\
const rustlen = mem[retptr / 4 + 1];\n\
{guard}
const realRet = {}(ptr, len).slice();\n\
wasm.__wbindgen_free(ptr, len * {});\n\
const realRet = {}(rustptr, rustlen).slice();\n\
wasm.__wbindgen_free(rustptr, rustlen * {});\n\
return realRet;\n\
",
f,
ty.size(),
guard = if optional { "if (ptr === 0) return;" } else { "" },
guard = if optional { "if (rustptr === 0) return;" } else { "" },
);
return Ok(self);
}