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

Fix handling imported memories

Browse Source 
Need to make sure we update the import itself and configure the value on
the import object!
This commit is contained in:
Alex Crichton 2019-05-31 07:29:13 -07:00
parent 81fbc642f4
commit cbd4b87d08
1 changed files with 4 additions and 3 deletions

7
crates/cli-support/src/js/mod.rs

@ -453,7 +453,8 @@ impl<'a> Context<'a> {
fn gen_init(&mut self, needs_manual_start: bool) -> (String, String) { fn gen_init(&mut self, needs_manual_start: bool) -> (String, String) {
let mem = self.module.memories.get(self.memory); let mem = self.module.memories.get(self.memory);
let (init_memory1, init_memory2) = if mem.import.is_some() { let (init_memory1, init_memory2) = if let Some(id) = mem.import {
self.module.imports.get_mut(id).module = "wbg".to_string();
let mut memory = String::from("new WebAssembly.Memory({"); let mut memory = String::from("new WebAssembly.Memory({");
memory.push_str(&format!("initial:{}", mem.initial)); memory.push_str(&format!("initial:{}", mem.initial));
if let Some(max) = mem.maximum { if let Some(max) = mem.maximum {
@ -465,8 +466,8 @@ impl<'a> Context<'a> {
memory.push_str("})"); memory.push_str("})");
self.imports_post.push_str("let memory;\n"); self.imports_post.push_str("let memory;\n");
( (
format!("memory = __exports.memory = maybe_memory;"), format!("memory = imports.wbg.memory = maybe_memory;"),
format!("memory = __exports.memory = {};", memory), format!("memory = imports.wbg.memory = {};", memory),
) )
} else { } else {
(String::new(), String::new()) (String::new(), String::new())