mirror of
https://github.com/fluencelabs/wasm-bindgen
synced 2025-04-25 14:12:13 +00:00
This commit is the second, and hopefully last massive, refactor for using WebIDL bindings internally in `wasm-bindgen`. This commit actually fully executes on the task at hand, moving `wasm-bindgen` to internally using WebIDL bindings throughout its code generation, anyref passes, etc. This actually fixes a number of issues that have existed in the anyref pass for some time now! The main changes here are to basically remove the usage of `Descriptor` from generating JS bindings. Instead two new types are introduced: `NonstandardIncoming` and `NonstandardOutgoing` which are bindings lists used for incoming/outgoing bindings. These mirror the standard terminology and literally have variants which are the standard values. All `Descriptor` types are now mapped into lists of incoming/outgoing bindings and used for process in wasm-bindgen. All JS generation has been refactored and updated to now process these lists of bindings instead of the previous `Descriptor`. In other words this commit takes `js2rust.rs` and `rust2js.rs` and first splits them in two. Interpretation of `Descriptor` and what to do for conversions is in the binding selection modules. The actual generation of JS from the binding selection is now performed by `incoming.rs` and `outgoing.rs`. To boot this also deduplicates all the code between the argument handling of `js2rust.rs` and return value handling of `rust2js.rs`. This means that to implement a new binding you only need to implement it one place and it's implemented for free in the other! This commit is not the end of the story though. I would like to add a mdoe to `wasm-bindgen` that literally emits a WebIDL bindings section. That's left for a third (and hopefully final) refactoring which is also intended to optimize generated JS for bindings. This commit currently loses the optimization where an imported is hooked up by value directly whenever a shim isn't needed. It's planned that the next refactoring to emit a webidl binding section that can be added back in. It shouldn't be too too hard hopefully since all the scaffolding is in place now. cc #1524
140 lines
5.5 KiB
Rust
140 lines
5.5 KiB
Rust
use crate::webidl::{NonstandardIncoming, NonstandardOutgoing};
|
|
use crate::webidl::{NonstandardWebidlSection, WasmBindgenAux};
|
|
use failure::Error;
|
|
use std::collections::HashSet;
|
|
use walrus::Module;
|
|
use wasm_bindgen_anyref_xform::Context;
|
|
use wasm_webidl_bindings::ast;
|
|
|
|
pub fn process(module: &mut Module) -> Result<(), Error> {
|
|
let mut cfg = Context::default();
|
|
cfg.prepare(module)?;
|
|
let bindings = module
|
|
.customs
|
|
.get_typed_mut::<NonstandardWebidlSection>()
|
|
.expect("webidl custom section should exist");
|
|
|
|
// Transform all exported functions in the module, using the bindings listed
|
|
// for each exported function.
|
|
for (export, binding) in bindings.exports.iter_mut() {
|
|
let ty = module.types.get(binding.wasm_ty);
|
|
let args = Arguments::Incoming(&mut binding.incoming);
|
|
let (args, ret) = extract_anyrefs(ty, args);
|
|
cfg.export_xform(*export, &args, ret);
|
|
}
|
|
|
|
// Transform all imported functions in the module, using the bindings listed
|
|
// for each imported function.
|
|
for (import, binding) in bindings.imports.iter_mut() {
|
|
let ty = module.types.get(binding.wasm_ty);
|
|
let args = Arguments::Outgoing(&mut binding.outgoing);
|
|
let (args, ret) = extract_anyrefs(ty, args);
|
|
cfg.import_xform(*import, &args, ret);
|
|
}
|
|
|
|
// And finally transform all table elements that are used as function
|
|
// pointers for closures and such.
|
|
for (idx, binding) in bindings.elems.iter_mut() {
|
|
let ty = module.types.get(binding.wasm_ty);
|
|
let args = Arguments::Incoming(&mut binding.incoming);
|
|
let (args, ret) = extract_anyrefs(ty, args);
|
|
if let Some(new) = cfg.table_element_xform(*idx, &args, ret) {
|
|
*idx = new;
|
|
}
|
|
}
|
|
|
|
cfg.run(module)?;
|
|
walrus::passes::gc::run(module);
|
|
|
|
// The GC pass above may end up removing some imported intrinsics. For
|
|
// example `__wbindgen_object_clone_ref` is no longer needed after the
|
|
// anyref pass. Make sure to delete the associated metadata for those
|
|
// intrinsics so we don't try to access stale intrinsics later on.
|
|
let remaining_imports = module
|
|
.imports
|
|
.iter()
|
|
.map(|i| i.id())
|
|
.collect::<HashSet<_>>();
|
|
module
|
|
.customs
|
|
.get_typed_mut::<NonstandardWebidlSection>()
|
|
.expect("webidl custom section should exist")
|
|
.imports
|
|
.retain(|id, _| remaining_imports.contains(id));
|
|
module
|
|
.customs
|
|
.get_typed_mut::<WasmBindgenAux>()
|
|
.expect("wasm-bindgen aux section should exist")
|
|
.import_map
|
|
.retain(|id, _| remaining_imports.contains(id));
|
|
Ok(())
|
|
}
|
|
|
|
enum Arguments<'a> {
|
|
Incoming(&'a mut [NonstandardIncoming]),
|
|
Outgoing(&'a mut [NonstandardOutgoing]),
|
|
}
|
|
|
|
/// Extract a description of the anyref arguments from the function signature
|
|
/// described by `f`.
|
|
///
|
|
/// The returned values are expected to be passed to the anyref transformation
|
|
/// pass, and indicate which arguments (by index) in the wasm signature should
|
|
/// be transformed from `i32` to `anyref` as well as whether the returned value
|
|
/// is an `anyref` or not.
|
|
///
|
|
/// The `offset` argument here is typically 0 and indicates the offset at which
|
|
/// the wasm abi arguments described by `f` start at. For closures this is 2
|
|
/// because two synthetic arguments are injected into the wasm signature which
|
|
/// aren't present in the `Function` signature.
|
|
fn extract_anyrefs(ty: &walrus::Type, args: Arguments<'_>) -> (Vec<(usize, bool)>, bool) {
|
|
let mut ret = Vec::new();
|
|
|
|
// First find all the `anyref` arguments in the input type, and we'll
|
|
// assume that they're owned anyref arguments for now (the `true`)
|
|
for (i, arg) in ty.params().iter().enumerate() {
|
|
if *arg == walrus::ValType::Anyref {
|
|
ret.push((i, true));
|
|
}
|
|
}
|
|
|
|
// Afterwards look through the argument list (specified with various
|
|
// bindings) to find any borrowed anyref values and update our
|
|
// transformation metadata accordingly. if we find one then the binding no
|
|
// longer needs to remember its borrowed but rather it's just a simple cast
|
|
// from wasm anyref to JS any.
|
|
match args {
|
|
Arguments::Incoming(incoming) => {
|
|
for binding in incoming {
|
|
let expr = match binding {
|
|
NonstandardIncoming::BorrowedAnyref {
|
|
val: ast::IncomingBindingExpression::Get(expr),
|
|
} => expr.clone(),
|
|
_ => continue,
|
|
};
|
|
ret.iter_mut().find(|p| p.0 == expr.idx as usize).unwrap().1 = false;
|
|
let new_binding = ast::IncomingBindingExpressionAs {
|
|
ty: walrus::ValType::Anyref,
|
|
expr: Box::new(expr.into()),
|
|
};
|
|
*binding = NonstandardIncoming::Standard(new_binding.into());
|
|
}
|
|
}
|
|
Arguments::Outgoing(outgoing) => {
|
|
for binding in outgoing {
|
|
let idx = match binding {
|
|
NonstandardOutgoing::BorrowedAnyref { idx } => *idx,
|
|
_ => continue,
|
|
};
|
|
ret.iter_mut().find(|p| p.0 == idx as usize).unwrap().1 = false;
|
|
let new_binding = ast::OutgoingBindingExpressionAs {
|
|
idx,
|
|
ty: ast::WebidlScalarType::Any.into(),
|
|
};
|
|
*binding = NonstandardOutgoing::Standard(new_binding.into());
|
|
}
|
|
}
|
|
}
|
|
(ret, ty.results() == &[walrus::ValType::Anyref])
|
|
}
|