fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-06-17 15:01:23 +00:00
Code Issues Projects Releases Wiki Activity

Don't generate code for dead imports

Browse Source
This commit is contained in:
Alex Crichton
2017-12-20 11:34:53 -08:00
parent 5e80b082a9
commit b548239e02
3 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/wasm-bindgen-cli-support/src/lib.rs
View File

@ -100,7 +100,7 @@ impl Object {
ts.nodejs = self.nodejs;
ts.debug = self.debug;
ts.generate_program(&self.program, &self.module);
ts.to_string(&self.module)
ts.to_string(&self.module, &self.program)
}
}

30
crates/wasm-bindgen-cli-support/src/ts.rs
View File

@ -10,7 +10,6 @@ pub struct Js {
exports: Vec<(String, String, String)>,
wasm_exports_bound: HashSet<String>,
classes: Vec<String>,
imports: Vec<(String, String, String)>,
pub nodejs: bool,
pub debug: bool,
}
@ -26,9 +25,6 @@ impl Js {
for s in program.structs.iter() {
self.generate_struct(s);
}
for s in program.imports.iter() {
self.generate_import(s);
}
}
pub fn generate_free_function(&mut self, func: &shared::Function) {
@ -257,7 +253,9 @@ impl Js {
(format!("{} {}", prefix, dst), dst_ts)
}
pub fn generate_import(&mut self, import: &shared::Function) {
pub fn generate_import(&mut self, import: &shared::Function)
-> (String, String)
{
let mut dst = String::new();
let mut ts_dst = String::new();
@ -348,10 +346,10 @@ impl Js {
};
dst.push_str(&format!("return {};\n}}", invoc));
self.imports.push((import.name.clone(), dst, ts_dst));
(dst, ts_dst)
}
pub fn to_string(&mut self, m: &Module) -> String {
pub fn to_string(&mut self, m: &Module, program: &shared::Program) -> String {
if self.debug {
self.expose_global_slab();
self.expose_global_stack();
@ -428,13 +426,21 @@ impl Js {
let mut extra_imports_interface = String::new();
let mut imports_bound = HashSet::new();
let mut imports_interface = String::new();
for &(ref import, ref val, ref ts_import) in self.imports.iter() {
imports_bound.insert(import.clone());
imports_object.push_str(import);
for import in program.imports.iter() {
// Only actually generate this import if it ended up being used in
// the wasm module, an optimization pass at some point may have
// ended up removing the code that needed the import, removing the
// import.
if !wasm_imports.contains_key(&import.name) {
continue
}
imports_bound.insert(import.name.clone());
let (val, ts) = self.generate_import(import);
imports_object.push_str(&import.name);
imports_object.push_str(":");
imports_object.push_str(val);
imports_object.push_str(&val);
imports_object.push_str(",\n");
imports_interface.push_str(ts_import);
imports_interface.push_str(&ts);
imports_interface.push_str("\n");
}