Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make maybe_memory truly optional #2469

Merged
merged 8 commits into from
Mar 4, 2021
Merged

Make maybe_memory truly optional #2469

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8898769
Make maybe_memory optional in TS
RReverser Feb 26, 2021
3bbc83a
Add rust-toolchain to raytrace example
RReverser Feb 26, 2021
998d167
Rework init_memory
RReverser Feb 26, 2021
0deddda
Format
RReverser Feb 26, 2021
bd98038
Update cargo fmt & reformat again
RReverser Feb 26, 2021
5d79fa4
Use explicit nightly version for Raytracer on CI
RReverser Feb 26, 2021
7bf0e6f
Delete rust-toolchain
RReverser Mar 2, 2021
b77ba82
Update azure-pipelines.yml
RReverser Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions crates/cli-support/src/js/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ impl<'a> Context<'a> {
let (memory_doc, memory_param) = if has_memory {
(
"* @param {WebAssembly.Memory} maybe_memory\n",
", maybe_memory: WebAssembly.Memory",
", maybe_memory?: WebAssembly.Memory",
)
} else {
("", "")
Expand Down Expand Up @@ -610,24 +610,23 @@ impl<'a> Context<'a> {
) -> Result<(String, String), Error> {
let module_name = "wbg";
let mut init_memory_arg = "";
let mut init_memory1 = String::new();
let mut init_memory2 = String::new();
let mut init_memory = String::new();
let mut has_memory = false;
if let Some(mem) = self.module.memories.iter().next() {
if let Some(id) = mem.import {
self.module.imports.get_mut(id).module = module_name.to_string();
let mut memory = String::from("new WebAssembly.Memory({");
memory.push_str(&format!("initial:{}", mem.initial));
init_memory = format!(
"imports.{}.memory = maybe_memory || new WebAssembly.Memory({{",
module_name
);
init_memory.push_str(&format!("initial:{}", mem.initial));
if let Some(max) = mem.maximum {
memory.push_str(&format!(",maximum:{}", max));
init_memory.push_str(&format!(",maximum:{}", max));
}
if mem.shared {
memory.push_str(",shared:true");
init_memory.push_str(",shared:true");
}
memory.push_str("})");
self.imports_post.push_str("let memory;\n");
init_memory1 = format!("memory = imports.{}.memory = maybe_memory;", module_name);
init_memory2 = format!("memory = imports.{}.memory = {};", module_name, memory);
init_memory.push_str("});");
init_memory_arg = ", maybe_memory";
has_memory = true;
}
Expand Down Expand Up @@ -706,9 +705,8 @@ impl<'a> Context<'a> {

let js = format!(
"\
async function load(module, imports{init_memory_arg}) {{
async function load(module, imports) {{
if (typeof Response === 'function' && module instanceof Response) {{
{init_memory2}
if (typeof WebAssembly.instantiateStreaming === 'function') {{
try {{
return await WebAssembly.instantiateStreaming(module, imports);
Expand All @@ -731,7 +729,6 @@ impl<'a> Context<'a> {
return await WebAssembly.instantiate(bytes, imports);

}} else {{
{init_memory1}
const instance = await WebAssembly.instantiate(module, imports);

if (instance instanceof WebAssembly.Instance) {{
Expand All @@ -752,7 +749,9 @@ impl<'a> Context<'a> {
input = fetch(input);
}}

const {{ instance, module }} = await load(await input, imports{init_memory_arg});
{init_memory}

const {{ instance, module }} = await load(await input, imports);

wasm = instance.exports;
init.__wbindgen_wasm_module = module;
Expand All @@ -762,8 +761,7 @@ impl<'a> Context<'a> {
",
init_memory_arg = init_memory_arg,
default_module_path = default_module_path,
init_memory1 = init_memory1,
init_memory2 = init_memory2,
init_memory = init_memory,
start = if needs_manual_start {
"wasm.__wbindgen_start();"
} else {
Expand Down