Mass rename anyref to externref (#2142)

Updates a mess of dependencies and tracks the most recent version of the
reference types specification.
This commit is contained in:
Alex Crichton
2020-05-18 09:36:30 -05:00
committed by GitHub
parent 61e8fc0d38
commit 996e92f3ae
65 changed files with 604 additions and 596 deletions

View File

@ -0,0 +1,26 @@
[package]
name = "wasm-bindgen-externref-xform"
version = "0.2.62"
authors = ["The wasm-bindgen Developers"]
license = "MIT/Apache-2.0"
repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/externref-xform"
homepage = "https://rustwasm.github.io/wasm-bindgen/"
documentation = "https://docs.rs/wasm-bindgen-externref-xform"
description = """
Internal externref transformations for wasm-bindgen
"""
edition = '2018'
[dependencies]
anyhow = "1.0"
walrus = "0.17.0"
[dev-dependencies]
rayon = "1.0"
wasmprinter = "0.2"
wast = "17.0"
wat = "1.0"
[[test]]
name = "all"
harness = false

View File

@ -0,0 +1 @@
../../LICENSE-APACHE

View File

@ -0,0 +1 @@
../../LICENSE-MIT

View File

@ -0,0 +1,755 @@
//! Transformation for wasm-bindgen to enable usage of `externref` in a wasm
//! module.
//!
//! This crate is in charge of enabling code using `wasm-bindgen` to use the
//! `externref` type inside of the wasm module. This transformation pass primarily
//! wraps exports and imports in shims which use `externref`, but quickly turn them
//! into `i32` value types. This is all largely a stopgap until Rust has
//! first-class support for the `externref` type, but that's thought to be in the
//! far future and will take quite some time to implement. In the meantime, we
//! have this!
//!
//! The pass here works by collecting information during binding generation
//! about imports and exports. Afterwards this pass runs in one go against a
//! wasm module, updating exports, imports, calls to these functions, etc. The
//! goal at least is to have valid wasm modules coming in that don't use
//! `externref` and valid wasm modules going out which use `externref` at the fringes.
use anyhow::{anyhow, bail, Error};
use std::cmp;
use std::collections::{BTreeMap, HashMap, HashSet};
use std::mem;
use walrus::ir::*;
use walrus::{ElementId, ExportId, ImportId, InstrLocId, TypeId};
use walrus::{FunctionId, GlobalId, InitExpr, Module, TableId, ValType};
// must be kept in sync with src/lib.rs and EXTERNREF_HEAP_START
const DEFAULT_MIN: u32 = 32;
/// State of the externref pass, used to collect information while bindings are
/// generated and used eventually to actually execute the entire pass.
#[derive(Default)]
pub struct Context {
// Functions within the module that we're gonna be wrapping, organized by
// type. The `Function` contains information about what arguments/return
// values in the function signature should turn into externref.
imports: HashMap<ImportId, Function>,
exports: HashMap<ExportId, Function>,
// List of functions we're transforming that are present in the function
// table. Each index here is an index into the function table, and the
// `Function` describes how we're transforming it.
new_elements: Vec<(u32, Function)>,
// When wrapping closures with new shims, this is the index of the next
// table entry that we'll be handing out.
new_element_offset: u32,
// Map of the existing function table, keyed by offset and contains the
// final offset plus the element segment used to initialized that range.
elements: BTreeMap<u32, ElementId>,
// The externref table we'll be using, injected after construction
table: Option<TableId>,
}
pub struct Meta {
pub table: TableId,
pub alloc: Option<FunctionId>,
pub drop_slice: Option<FunctionId>,
pub live_count: Option<FunctionId>,
}
struct Transform<'a> {
cx: &'a mut Context,
// A map of functions to intrinsics that they represent
intrinsic_map: HashMap<FunctionId, Intrinsic>,
// A map of old import functions to the new internally-defined shims which
// call the correct new import functions
import_map: HashMap<FunctionId, FunctionId>,
// A set of all shims we've created
shims: HashSet<FunctionId>,
// Indices of items that we have injected or found. This state is maintained
// during the pass execution.
table: TableId,
clone_ref: Option<FunctionId>,
heap_alloc: Option<FunctionId>,
heap_dealloc: Option<FunctionId>,
stack_pointer: GlobalId,
}
struct Function {
// A map of argument index to whether it's an owned or borrowed externref
// (owned = true)
args: HashMap<usize, bool>,
ret_externref: bool,
}
enum Intrinsic {
TableGrow,
TableSetNull,
DropRef,
CloneRef,
}
impl Context {
/// Executed first very early over a wasm module, used to learn about how
/// large the function table is so we know what indexes to hand out when
/// we're appending entries.
pub fn prepare(&mut self, module: &mut Module) -> Result<(), Error> {
// Figure out what the maximum index of functions pointers are. We'll
// be adding new entries to the function table later (maybe) so
// precalculate this ahead of time.
if let Some(t) = module.tables.main_function_table()? {
let t = module.tables.get(t);
for id in t.elem_segments.iter() {
let elem = module.elements.get(*id);
let offset = match &elem.kind {
walrus::ElementKind::Active { offset, .. } => offset,
_ => continue,
};
let offset = match offset {
walrus::InitExpr::Value(Value::I32(n)) => *n as u32,
other => bail!("invalid offset for segment of function table {:?}", other),
};
let max = offset + elem.members.len() as u32;
self.new_element_offset = cmp::max(self.new_element_offset, max);
self.elements.insert(offset, *id);
}
}
// Add in an externref table to the module, which we'll be using for
// our transform below.
self.table = Some(
module
.tables
.add_local(DEFAULT_MIN, None, ValType::Externref),
);
Ok(())
}
/// Store information about an imported function that needs to be
/// transformed. The actual transformation happens later during `run`.
pub fn import_xform(
&mut self,
id: ImportId,
externref: &[(usize, bool)],
ret_externref: bool,
) -> &mut Self {
if let Some(f) = self.function(externref, ret_externref) {
self.imports.insert(id, f);
}
self
}
/// Store information about an exported function that needs to be
/// transformed. The actual transformation happens later during `run`.
pub fn export_xform(
&mut self,
id: ExportId,
externref: &[(usize, bool)],
ret_externref: bool,
) -> &mut Self {
if let Some(f) = self.function(externref, ret_externref) {
self.exports.insert(id, f);
}
self
}
/// Store information about a function pointer that needs to be transformed.
/// The actual transformation happens later during `run`. Returns an index
/// that the new wrapped function pointer will be injected at.
pub fn table_element_xform(
&mut self,
idx: u32,
externref: &[(usize, bool)],
ret_externref: bool,
) -> Option<u32> {
self.function(externref, ret_externref).map(|f| {
self.new_elements.push((idx, f));
self.new_elements.len() as u32 + self.new_element_offset - 1
})
}
fn function(&self, externref: &[(usize, bool)], ret_externref: bool) -> Option<Function> {
if !ret_externref && externref.len() == 0 {
return None;
}
Some(Function {
args: externref.iter().cloned().collect(),
ret_externref,
})
}
pub fn run(&mut self, module: &mut Module) -> Result<Meta, Error> {
let table = self.table.unwrap();
// Inject a stack pointer global which will be used for managing the
// stack on the externref table.
let init = InitExpr::Value(Value::I32(DEFAULT_MIN as i32));
let stack_pointer = module.globals.add_local(ValType::I32, true, init);
let mut heap_alloc = None;
let mut heap_dealloc = None;
let mut drop_slice = None;
let mut live_count = None;
// Find exports of some intrinsics which we only need for a runtime
// implementation.
let mut to_delete = Vec::new();
for export in module.exports.iter() {
let f = match export.item {
walrus::ExportItem::Function(f) => f,
_ => continue,
};
match export.name.as_str() {
"__externref_table_alloc" => heap_alloc = Some(f),
"__externref_table_dealloc" => heap_dealloc = Some(f),
"__externref_drop_slice" => drop_slice = Some(f),
"__externref_heap_live_count" => live_count = Some(f),
_ => continue,
}
to_delete.push(export.id());
}
for id in to_delete {
module.exports.delete(id);
}
let mut clone_ref = None;
if let Some(heap_alloc) = heap_alloc {
// Create a shim function that looks like:
//
// (func __wbindgen_object_clone_ref (param i32) (result i32)
// (local i32)
// (table.set
// (tee_local 1 (call $heap_alloc))
// (table.get (local.get 0)))
// (local.get 1))
let mut builder =
walrus::FunctionBuilder::new(&mut module.types, &[ValType::I32], &[ValType::I32]);
let arg = module.locals.add(ValType::I32);
let local = module.locals.add(ValType::I32);
let mut body = builder.func_body();
body.call(heap_alloc)
.local_tee(local)
.local_get(arg)
.table_get(table)
.table_set(table)
.local_get(local);
let func = builder.finish(vec![arg], &mut module.funcs);
let name = "__wbindgen_object_clone_ref".to_string();
module.funcs.get_mut(func).name = Some(name);
clone_ref = Some(func);
}
// And run the transformation!
Transform {
cx: self,
intrinsic_map: HashMap::new(),
import_map: HashMap::new(),
shims: HashSet::new(),
table,
clone_ref,
heap_alloc,
heap_dealloc,
stack_pointer,
}
.run(module)?;
Ok(Meta {
table,
alloc: heap_alloc,
drop_slice,
live_count,
})
}
}
impl Transform<'_> {
fn run(&mut self, module: &mut Module) -> Result<(), Error> {
// Detect all the various intrinsics and such. This will also along the
// way inject an intrinsic for cloning an externref.
self.find_intrinsics(module)?;
// Perform transformations of imports, exports, and function pointers.
self.process_imports(module)?;
assert!(self.cx.imports.is_empty());
self.process_exports(module)?;
assert!(self.cx.exports.is_empty());
self.process_elements(module)?;
assert!(self.cx.new_elements.is_empty());
// If we didn't actually transform anything, no need to inject or
// rewrite anything from below.
if self.shims.is_empty() {
return Ok(());
}
// Perform all instruction transformations to rewrite calls between
// functions and make sure everything is still hooked up right.
self.rewrite_calls(module)?;
Ok(())
}
fn find_intrinsics(&mut self, module: &mut Module) -> Result<(), Error> {
// Build up a map of various imported intrinsics to wire them up to
// different implementations or different functions.
for import in module.imports.iter_mut() {
let f = match import.kind {
walrus::ImportKind::Function(f) => f,
_ => continue,
};
if import.module == "__wbindgen_externref_xform__" {
match import.name.as_str() {
"__wbindgen_externref_table_grow" => {
self.intrinsic_map.insert(f, Intrinsic::TableGrow);
}
"__wbindgen_externref_table_set_null" => {
self.intrinsic_map.insert(f, Intrinsic::TableSetNull);
}
n => bail!("unknown intrinsic: {}", n),
}
} else if import.module == "__wbindgen_placeholder__" {
match import.name.as_str() {
"__wbindgen_object_drop_ref" => {
self.intrinsic_map.insert(f, Intrinsic::DropRef);
}
"__wbindgen_object_clone_ref" => {
self.intrinsic_map.insert(f, Intrinsic::CloneRef);
}
_ => continue,
}
} else {
continue;
}
// Make sure we don't actually end up using the original import
// because any invocation of them should be remapped to something
// else.
import.name = format!("{}_unused", import.name);
}
Ok(())
}
fn heap_alloc(&self) -> Result<FunctionId, Error> {
self.heap_alloc.ok_or_else(|| {
anyhow!("failed to find the `__wbindgen_externref_table_alloc` function")
})
}
fn clone_ref(&self) -> Result<FunctionId, Error> {
self.clone_ref
.ok_or_else(|| anyhow!("failed to find intrinsics to enable `clone_ref` function"))
}
fn heap_dealloc(&self) -> Result<FunctionId, Error> {
self.heap_dealloc.ok_or_else(|| {
anyhow!("failed to find the `__wbindgen_externref_table_dealloc` function")
})
}
fn process_imports(&mut self, module: &mut Module) -> Result<(), Error> {
for import in module.imports.iter_mut() {
let f = match import.kind {
walrus::ImportKind::Function(f) => f,
_ => continue,
};
let func = match self.cx.imports.remove(&import.id()) {
Some(s) => s,
None => continue,
};
let (shim, externref_ty) = self.append_shim(
f,
&import.name,
func,
&mut module.types,
&mut module.funcs,
&mut module.locals,
)?;
self.import_map.insert(f, shim);
match &mut module.funcs.get_mut(f).kind {
walrus::FunctionKind::Import(f) => f.ty = externref_ty,
_ => unreachable!(),
}
}
Ok(())
}
fn process_exports(&mut self, module: &mut Module) -> Result<(), Error> {
// let mut new_exports = Vec::new();
for export in module.exports.iter_mut() {
let f = match export.item {
walrus::ExportItem::Function(f) => f,
_ => continue,
};
let function = match self.cx.exports.remove(&export.id()) {
Some(s) => s,
None => continue,
};
let (shim, _externref_ty) = self.append_shim(
f,
&export.name,
function,
&mut module.types,
&mut module.funcs,
&mut module.locals,
)?;
export.item = shim.into();
}
Ok(())
}
fn process_elements(&mut self, module: &mut Module) -> Result<(), Error> {
let table = match module.tables.main_function_table()? {
Some(t) => t,
None => return Ok(()),
};
let table = module.tables.get_mut(table);
// Create shims for all our functions and append them all to the segment
// which places elements at the end.
let mut new_segment = Vec::new();
for (idx, function) in mem::replace(&mut self.cx.new_elements, Vec::new()) {
let (&offset, &orig_element) = self
.cx
.elements
.range(..=idx)
.next_back()
.ok_or(anyhow!("failed to find segment defining index {}", idx))?;
let target = module.elements.get(orig_element).members[(idx - offset) as usize].ok_or(
anyhow!("function index {} not present in element segment", idx),
)?;
let (shim, _externref_ty) = self.append_shim(
target,
&format!("closure{}", idx),
function,
&mut module.types,
&mut module.funcs,
&mut module.locals,
)?;
new_segment.push(Some(shim));
}
// ... and next update the limits of the table in case any are listed.
let new_max = self.cx.new_element_offset + new_segment.len() as u32;
table.initial = cmp::max(table.initial, new_max);
if let Some(max) = table.maximum {
table.maximum = Some(cmp::max(max, new_max));
}
let kind = walrus::ElementKind::Active {
table: table.id(),
offset: InitExpr::Value(Value::I32(self.cx.new_element_offset as i32)),
};
let segment = module.elements.add(kind, ValType::Funcref, new_segment);
table.elem_segments.insert(segment);
Ok(())
}
fn append_shim(
&mut self,
shim_target: FunctionId,
name: &str,
mut func: Function,
types: &mut walrus::ModuleTypes,
funcs: &mut walrus::ModuleFunctions,
locals: &mut walrus::ModuleLocals,
) -> Result<(FunctionId, TypeId), Error> {
let target = funcs.get_mut(shim_target);
let (is_export, ty) = match &target.kind {
walrus::FunctionKind::Import(f) => (false, f.ty),
walrus::FunctionKind::Local(f) => (true, f.ty()),
_ => unreachable!(),
};
let target_ty = types.get(ty);
let target_ty_params = target_ty.params().to_vec();
let target_ty_results = target_ty.results().to_vec();
// Learn about the various operations we're doing up front. Afterwards
// we'll have a better idea bout what sort of code we're gonna be
// generating.
enum Convert {
None,
Store { owned: bool },
Load { owned: bool },
}
let mut param_tys = Vec::new();
let mut param_convert = Vec::new();
let mut externref_stack = 0;
for (i, old_ty) in target_ty.params().iter().enumerate() {
let is_owned = func.args.remove(&i);
let new_ty = is_owned
.map(|_which| ValType::Externref)
.unwrap_or(old_ty.clone());
param_tys.push(new_ty.clone());
if new_ty == *old_ty {
param_convert.push(Convert::None);
} else if is_export {
// We're calling an export, so we need to push this externref into
// a table somehow.
param_convert.push(Convert::Store {
owned: is_owned.unwrap(),
});
if is_owned == Some(false) {
externref_stack += 1;
}
} else {
// We're calling an import, so we just need to fetch our table
// value.
param_convert.push(Convert::Load {
owned: is_owned.unwrap(),
});
}
}
let new_ret = if func.ret_externref {
assert_eq!(target_ty.results(), &[ValType::I32]);
vec![ValType::Externref]
} else {
target_ty.results().to_vec()
};
let externref_ty = types.add(&param_tys, &new_ret);
// If we're an export then our shim is what's actually going to get
// exported, and it's going to have the externref signature.
//
// If we're an import, then our shim is what the Rust code calls, which
// means it'll have the original signature. The existing import's
// signature, however, is transformed to be an externref signature.
let shim_ty = if is_export { externref_ty } else { ty };
let mut builder = walrus::FunctionBuilder::new(
types,
if is_export {
&param_tys
} else {
&target_ty_params
},
if is_export {
&new_ret
} else {
&target_ty_results
},
);
let mut body = builder.func_body();
let params = types
.get(shim_ty)
.params()
.iter()
.cloned()
.map(|ty| locals.add(ty))
.collect::<Vec<_>>();
// Unconditionally allocate some locals which get cleaned up in later
// gc passes if we don't actually end up using them.
let fp = locals.add(ValType::I32);
let scratch_i32 = locals.add(ValType::I32);
let scratch_externref = locals.add(ValType::Externref);
// Update our stack pointer if there's any borrowed externref objects.
if externref_stack > 0 {
body.global_get(self.stack_pointer)
.const_(Value::I32(externref_stack))
.binop(BinaryOp::I32Sub)
.local_tee(fp)
.global_set(self.stack_pointer);
}
let mut next_stack_offset = 0;
for (i, convert) in param_convert.iter().enumerate() {
match *convert {
Convert::None => {
body.local_get(params[i]);
}
Convert::Load { owned: true } => {
// load the externref onto the stack, then afterwards
// deallocate our index, leaving the externref on the stack.
body.local_get(params[i])
.table_get(self.table)
.local_get(params[i])
.call(self.heap_dealloc()?);
}
Convert::Load { owned: false } => {
body.local_get(params[i]).table_get(self.table);
}
Convert::Store { owned: true } => {
// Allocate space for the externref, store it, and then leave
// the index of the allocated externref on the stack.
body.call(self.heap_alloc()?)
.local_tee(scratch_i32)
.local_get(params[i])
.table_set(self.table)
.local_get(scratch_i32);
}
Convert::Store { owned: false } => {
// Store an externref at an offset from our function's stack
// pointer frame.
body.local_get(fp);
let idx_local = if next_stack_offset == 0 {
fp
} else {
body.i32_const(next_stack_offset)
.binop(BinaryOp::I32Add)
.local_tee(scratch_i32);
scratch_i32
};
next_stack_offset += 1;
body.local_get(params[i])
.table_set(self.table)
.local_get(idx_local);
}
}
}
// Now that we've converted all the arguments, call the original
// function. This may be either an import or an export which we're
// wrapping.
body.call(shim_target);
// If an externref value is returned, then we need to be sure to apply
// special treatment to convert it to an i32 as well. Note that only
// owned externref values can be returned, so that's all that's handled
// here.
if func.ret_externref {
if is_export {
// We're an export so we have an i32 on the stack and need to
// convert it to an externref, basically by doing the same as an
// owned load above: get the value then deallocate our slot.
body.local_tee(scratch_i32)
.table_get(self.table)
.local_get(scratch_i32)
.call(self.heap_dealloc()?);
} else {
// Imports are the opposite, we have any externref on the stack
// and convert it to an i32 by allocating space for it and
// storing it there.
body.local_set(scratch_externref)
.call(self.heap_alloc()?)
.local_tee(scratch_i32)
.local_get(scratch_externref)
.table_set(self.table)
.local_get(scratch_i32);
}
}
// On function exit restore our externref stack pointer if we decremented
// it to start off.
//
// Note that we pave over all our stack slots with `ref.null` to ensure
// that the table doesn't accidentally hold a strong reference to items
// no longer in use by our wasm instance.
//
// TODO: use `table.fill` once that's spec'd
if externref_stack > 0 {
for i in 0..externref_stack {
body.local_get(fp);
if i > 0 {
body.i32_const(i).binop(BinaryOp::I32Add);
}
body.ref_null(ValType::Externref);
body.table_set(self.table);
}
body.local_get(fp)
.i32_const(externref_stack)
.binop(BinaryOp::I32Add)
.global_set(self.stack_pointer);
}
// Create the final expression node and then finish the function builder
// with a fresh type we've been calculating so far. Give the function a
// nice name for debugging and then we're good to go!
let id = builder.finish(params, funcs);
let name = format!("{} externref shim", name);
funcs.get_mut(id).name = Some(name);
self.shims.insert(id);
Ok((id, externref_ty))
}
fn rewrite_calls(&mut self, module: &mut Module) -> Result<(), Error> {
for (id, func) in module.funcs.iter_local_mut() {
if self.shims.contains(&id) {
continue;
}
let entry = func.entry_block();
dfs_pre_order_mut(
&mut Rewrite {
clone_ref: self.clone_ref()?,
heap_dealloc: self.heap_dealloc()?,
xform: self,
},
func,
entry,
);
}
return Ok(());
struct Rewrite<'a, 'b> {
xform: &'a Transform<'b>,
clone_ref: FunctionId,
heap_dealloc: FunctionId,
}
impl VisitorMut for Rewrite<'_, '_> {
fn start_instr_seq_mut(&mut self, seq: &mut InstrSeq) {
for i in (0..seq.instrs.len()).rev() {
let call = match &mut seq.instrs[i].0 {
Instr::Call(call) => call,
_ => continue,
};
let intrinsic = match self.xform.intrinsic_map.get(&call.func) {
Some(f) => f,
None => {
// If this wasn't a call of an intrinsic, but it was a
// call of one of our old import functions then we
// switch the functions we're calling here.
if let Some(f) = self.xform.import_map.get(&call.func) {
call.func = *f;
}
continue;
}
};
let ty = ValType::Externref;
match intrinsic {
Intrinsic::TableGrow => {
// Switch this to a `table.grow` instruction...
seq.instrs[i].0 = TableGrow {
table: self.xform.table,
}
.into();
// ... and then insert a `ref.null` before the
// preceding instruction as the value to grow the
// table with.
seq.instrs
.insert(i - 1, (RefNull { ty }.into(), InstrLocId::default()));
}
Intrinsic::TableSetNull => {
// Switch this to a `table.set` instruction...
seq.instrs[i].0 = TableSet {
table: self.xform.table,
}
.into();
// ... and then insert a `ref.null` as the
// preceding instruction
seq.instrs
.insert(i, (RefNull { ty }.into(), InstrLocId::default()));
}
Intrinsic::DropRef => call.func = self.heap_dealloc,
Intrinsic::CloneRef => call.func = self.clone_ref,
}
}
}
}
}
}

View File

@ -0,0 +1,258 @@
//! A small test framework to execute a test function over all files in a
//! directory.
//!
//! Each file in the directory has its own `CHECK-ALL` annotation indicating the
//! expected output of the test. That can be automatically updated with
//! `BLESS=1` in the environment. Otherwise the test are checked against the
//! listed expectation.
use anyhow::{anyhow, bail, Context, Result};
use rayon::prelude::*;
use std::env;
use std::fs;
use std::path::{Path, PathBuf};
use wast::parser::{Parse, Parser};
fn main() {
run("tests".as_ref(), runtest);
}
fn runtest(test: &Test) -> Result<String> {
let wasm = wat::parse_file(&test.file)?;
let mut walrus = walrus::Module::from_buffer(&wasm)?;
let mut cx = wasm_bindgen_externref_xform::Context::default();
cx.prepare(&mut walrus)?;
for directive in test.directives.iter() {
match &directive.kind {
DirectiveKind::Export(name) => {
let export = walrus
.exports
.iter()
.find(|e| e.name == *name)
.ok_or_else(|| anyhow!("failed to find export"))?;
cx.export_xform(export.id(), &directive.args, directive.ret_externref);
}
DirectiveKind::Import(module, field) => {
let import = walrus
.imports
.iter()
.find(|e| e.module == *module && e.name == *field)
.ok_or_else(|| anyhow!("failed to find export"))?;
cx.import_xform(import.id(), &directive.args, directive.ret_externref);
}
DirectiveKind::Table(idx) => {
cx.table_element_xform(*idx, &directive.args, directive.ret_externref);
}
}
}
cx.run(&mut walrus)?;
walrus::passes::gc::run(&mut walrus);
let printed = wasmprinter::print_bytes(&walrus.emit_wasm())?;
Ok(printed)
}
fn run(dir: &Path, run: fn(&Test) -> Result<String>) {
let mut tests = Vec::new();
find_tests(dir, &mut tests);
let filter = std::env::args().nth(1);
let bless = env::var("BLESS").is_ok();
let tests = tests
.iter()
.filter(|test| {
if let Some(filter) = &filter {
if let Some(s) = test.file_name().and_then(|s| s.to_str()) {
if !s.contains(filter) {
return false;
}
}
}
true
})
.collect::<Vec<_>>();
println!("\nrunning {} tests\n", tests.len());
let errors = tests
.par_iter()
.filter_map(|test| run_test(test, bless, run).err())
.collect::<Vec<_>>();
if !errors.is_empty() {
for msg in errors.iter() {
eprintln!("error: {:?}", msg);
}
panic!("{} tests failed", errors.len())
}
println!("test result: ok. {} passed\n", tests.len());
}
fn run_test(test: &Path, bless: bool, run: fn(&Test) -> anyhow::Result<String>) -> Result<()> {
(|| -> Result<_> {
let expected = Test::from_file(test)?;
let actual = run(&expected)?;
expected.check(&actual, bless)?;
Ok(())
})()
.context(format!("test failed - {}", test.display()))?;
Ok(())
}
fn find_tests(path: &Path, tests: &mut Vec<PathBuf>) {
for f in path.read_dir().unwrap() {
let f = f.unwrap();
if f.file_type().unwrap().is_dir() {
find_tests(&f.path(), tests);
continue;
}
match f.path().extension().and_then(|s| s.to_str()) {
Some("wat") => {}
_ => continue,
}
tests.push(f.path());
}
}
struct Test {
file: PathBuf,
directives: Vec<Directive>,
assertion: Option<String>,
}
struct Directive {
args: Vec<(usize, bool)>,
ret_externref: bool,
kind: DirectiveKind,
}
enum DirectiveKind {
Import(String, String),
Export(String),
Table(u32),
}
impl Test {
fn from_file(path: &Path) -> Result<Test> {
let contents = fs::read_to_string(path)?;
let mut iter = contents.lines();
let mut assertion = None;
let mut directives = Vec::new();
while let Some(line) = iter.next() {
if line.starts_with("(; CHECK-ALL:") {
let mut pattern = String::new();
while let Some(line) = iter.next() {
if line == ";)" {
break;
}
pattern.push_str(line);
pattern.push_str("\n");
}
while pattern.ends_with("\n") {
pattern.pop();
}
if iter.next().is_some() {
bail!("CHECK-ALL must be at the end of the file");
}
assertion = Some(pattern);
continue;
}
if !line.starts_with(";; @xform") {
continue;
}
let directive = &line[9..];
let buf = wast::parser::ParseBuffer::new(directive)?;
directives.push(wast::parser::parse::<Directive>(&buf)?);
}
Ok(Test {
file: path.to_path_buf(),
directives,
assertion,
})
}
fn check(&self, output: &str, bless: bool) -> Result<()> {
if bless {
update_output(&self.file, output)
} else if let Some(pattern) = &self.assertion {
if output == pattern {
return Ok(());
}
bail!(
"expected\n {}\n\nactual\n {}",
pattern.replace("\n", "\n "),
output.replace("\n", "\n ")
);
} else {
bail!(
"no test assertions were found in this file, but you can \
rerun tests with `BLESS=1` to automatically add assertions \
to this file"
);
}
}
}
fn update_output(path: &Path, output: &str) -> Result<()> {
let contents = fs::read_to_string(path)?;
let start = contents.find("(; CHECK-ALL:").unwrap_or(contents.len());
let mut new_output = String::new();
for line in output.lines() {
new_output.push_str(line);
new_output.push_str("\n");
}
let new = format!(
"{}\n\n(; CHECK-ALL:\n{}\n;)\n",
contents[..start].trim(),
new_output.trim_end()
);
fs::write(path, new)?;
Ok(())
}
impl<'a> Parse<'a> for Directive {
fn parse(parser: Parser<'a>) -> wast::parser::Result<Self> {
use wast::kw;
wast::custom_keyword!(externref_owned);
wast::custom_keyword!(externref_borrowed);
wast::custom_keyword!(other);
let kind = if parser.peek::<kw::import>() {
parser.parse::<kw::import>()?;
DirectiveKind::Import(parser.parse()?, parser.parse()?)
} else if parser.peek::<kw::export>() {
parser.parse::<kw::export>()?;
DirectiveKind::Export(parser.parse()?)
} else {
parser.parse::<kw::table>()?;
DirectiveKind::Table(parser.parse()?)
};
let mut args = Vec::new();
parser.parens(|p| {
let mut i = 0;
while !p.is_empty() {
if parser.peek::<externref_owned>() {
parser.parse::<externref_owned>()?;
args.push((i, true));
} else if parser.peek::<externref_borrowed>() {
parser.parse::<externref_borrowed>()?;
args.push((i, false));
} else {
parser.parse::<other>()?;
}
i += 1;
}
Ok(())
})?;
let ret_externref = parser.parse::<Option<externref_owned>>()?.is_some();
Ok(Directive {
args,
ret_externref,
kind,
})
}
}

View File

@ -0,0 +1,28 @@
;; @xform export "foo" (externref_owned)
(module
(func $foo (export "foo") (param i32))
(func $alloc (export "__externref_table_alloc") (result i32)
i32.const 0)
(func $dealloc (export "__externref_table_dealloc") (param i32))
)
(; CHECK-ALL:
(module
(type (;0;) (func (result i32)))
(type (;1;) (func (param i32)))
(type (;2;) (func (param externref)))
(func $foo externref shim (type 2) (param externref)
(local i32)
call $alloc
local.tee 1
local.get 0
table.set 0
local.get 1
call $foo)
(func $alloc (type 0) (result i32)
i32.const 0)
(func $foo (type 1) (param i32))
(table (;0;) 32 externref)
(export "foo" (func $foo externref shim)))
;)

View File

@ -0,0 +1,37 @@
;; @xform export "foo" (externref_borrowed)
(module
(func $foo (export "foo") (param i32))
(func $alloc (export "__externref_table_alloc") (result i32)
i32.const 0)
(func $dealloc (export "__externref_table_dealloc") (param i32))
)
(; CHECK-ALL:
(module
(type (;0;) (func (param i32)))
(type (;1;) (func (param externref)))
(func $foo externref shim (type 1) (param externref)
(local i32)
global.get 0
i32.const 1
i32.sub
local.tee 1
global.set 0
local.get 1
local.get 0
table.set 0
local.get 1
call $foo
local.get 1
ref.nullextern
table.set 0
local.get 1
i32.const 1
i32.add
global.set 0)
(func $foo (type 0) (param i32))
(table (;0;) 32 externref)
(global (;0;) (mut i32) (i32.const 32))
(export "foo" (func $foo externref shim)))
;)

View File

@ -0,0 +1,48 @@
;; @xform export "foo" (externref_owned) externref_owned
(module
(import "__wbindgen_placeholder__" "__wbindgen_object_clone_ref"
(func $clone (param i32) (result i32)))
(func $foo (export "foo") (param i32) (result i32)
local.get 0
call $clone)
(func $alloc (export "__externref_table_alloc") (result i32)
i32.const 0)
(func $dealloc (export "__externref_table_dealloc") (param i32))
)
(; CHECK-ALL:
(module
(type (;0;) (func (result i32)))
(type (;1;) (func (param i32)))
(type (;2;) (func (param i32) (result i32)))
(type (;3;) (func (param externref) (result externref)))
(func $foo externref shim (type 3) (param externref) (result externref)
(local i32)
call $alloc
local.tee 1
local.get 0
table.set 0
local.get 1
call $foo
local.tee 1
table.get 0
local.get 1
call $dealloc)
(func $__wbindgen_object_clone_ref (type 2) (param i32) (result i32)
(local i32)
call $alloc
local.tee 1
local.get 0
table.get 0
table.set 0
local.get 1)
(func $foo (type 2) (param i32) (result i32)
local.get 0
call $__wbindgen_object_clone_ref)
(func $alloc (type 0) (result i32)
i32.const 0)
(func $dealloc (type 1) (param i32))
(table (;0;) 32 externref)
(export "foo" (func $foo externref shim)))
;)

View File

@ -0,0 +1,35 @@
;; @xform export "foo" (externref_owned)
(module
(import "__wbindgen_placeholder__" "__wbindgen_object_drop_ref"
(func $drop (param i32)))
(func $foo (export "foo") (param i32)
local.get 0
call $drop)
(func $alloc (export "__externref_table_alloc") (result i32)
i32.const 0)
(func $dealloc (export "__externref_table_dealloc") (param i32))
)
(; CHECK-ALL:
(module
(type (;0;) (func (result i32)))
(type (;1;) (func (param i32)))
(type (;2;) (func (param externref)))
(func $foo externref shim (type 2) (param externref)
(local i32)
call $alloc
local.tee 1
local.get 0
table.set 0
local.get 1
call $foo)
(func $foo (type 1) (param i32)
local.get 0
call $dealloc)
(func $alloc (type 0) (result i32)
i32.const 0)
(func $dealloc (type 1) (param i32))
(table (;0;) 32 externref)
(export "foo" (func $foo externref shim)))
;)

View File

@ -0,0 +1,31 @@
;; @xform import "" "a" (externref_owned)
(module
(import "" "a" (func $a (param i32)))
(func (export "foo")
i32.const 0
call $a)
(func $alloc (export "__externref_table_alloc") (result i32)
i32.const 0)
(func $dealloc (export "__externref_table_dealloc") (param i32))
)
(; CHECK-ALL:
(module
(type (;0;) (func))
(type (;1;) (func (param i32)))
(type (;2;) (func (param externref)))
(import "" "a" (func $a (type 2)))
(func $a externref shim (type 1) (param i32)
local.get 0
table.get 0
local.get 0
call $dealloc
call $a)
(func (;2;) (type 0)
i32.const 0
call $a externref shim)
(func $dealloc (type 1) (param i32))
(table (;0;) 32 externref)
(export "foo" (func 2)))
;)

View File

@ -0,0 +1,32 @@
;; @xform import "" "a" () externref_owned
(module
(import "" "a" (func $a (result i32)))
(func (export "foo") (result i32)
call $a)
(func $alloc (export "__externref_table_alloc") (result i32)
i32.const 0)
(func $dealloc (export "__externref_table_dealloc") (param i32))
)
(; CHECK-ALL:
(module
(type (;0;) (func (result i32)))
(type (;1;) (func (result externref)))
(import "" "a" (func $a (type 1)))
(func $a externref shim (type 0) (result i32)
(local i32 externref)
call $a
local.set 1
call $alloc
local.tee 0
local.get 1
table.set 0
local.get 0)
(func (;2;) (type 0) (result i32)
call $a externref shim)
(func $alloc (type 0) (result i32)
i32.const 0)
(table (;0;) 32 externref)
(export "foo" (func 2)))
;)

View File

@ -0,0 +1,28 @@
;; @xform import "" "a" (externref_borrowed)
(module
(import "" "a" (func $a (param i32)))
(func (export "foo")
i32.const 0
call $a)
(func $alloc (export "__externref_table_alloc") (result i32)
i32.const 0)
(func $dealloc (export "__externref_table_dealloc") (param i32))
)
(; CHECK-ALL:
(module
(type (;0;) (func))
(type (;1;) (func (param i32)))
(type (;2;) (func (param externref)))
(import "" "a" (func $a (type 2)))
(func $a externref shim (type 1) (param i32)
local.get 0
table.get 0
call $a)
(func (;2;) (type 0)
i32.const 0
call $a externref shim)
(table (;0;) 32 externref)
(export "foo" (func 2)))
;)

View File

@ -0,0 +1,48 @@
;; @xform export "a" (other externref_borrowed other externref_owned other)
(module
(func $a (export "a") (param f32 i32 i64 i32 i32))
(func $alloc (export "__externref_table_alloc") (result i32)
i32.const 0)
(func $dealloc (export "__externref_table_dealloc") (param i32))
)
(; CHECK-ALL:
(module
(type (;0;) (func (result i32)))
(type (;1;) (func (param f32 i32 i64 i32 i32)))
(type (;2;) (func (param f32 externref i64 externref i32)))
(func $a externref shim (type 2) (param f32 externref i64 externref i32)
(local i32 i32)
global.get 0
i32.const 1
i32.sub
local.tee 5
global.set 0
local.get 0
local.get 5
local.get 1
table.set 0
local.get 5
local.get 2
call $alloc
local.tee 6
local.get 3
table.set 0
local.get 6
local.get 4
call $a
local.get 5
ref.nullextern
table.set 0
local.get 5
i32.const 1
i32.add
global.set 0)
(func $alloc (type 0) (result i32)
i32.const 0)
(func $a (type 1) (param f32 i32 i64 i32 i32))
(table (;0;) 32 externref)
(global (;0;) (mut i32) (i32.const 32))
(export "a" (func $a externref shim)))
;)

View File

@ -0,0 +1,45 @@
;; @xform import "" "a" (other externref_borrowed other externref_owned other)
(module
(import "" "a" (func $a (param f32 i32 i64 i32 i32)))
(func (export "foo")
f32.const 1
i32.const 2
i64.const 3
i32.const 4
i32.const 5
call $a)
(func $alloc (export "__externref_table_alloc") (result i32)
i32.const 0)
(func $dealloc (export "__externref_table_dealloc") (param i32))
)
(; CHECK-ALL:
(module
(type (;0;) (func))
(type (;1;) (func (param i32)))
(type (;2;) (func (param f32 i32 i64 i32 i32)))
(type (;3;) (func (param f32 externref i64 externref i32)))
(import "" "a" (func $a (type 3)))
(func $a externref shim (type 2) (param f32 i32 i64 i32 i32)
local.get 0
local.get 1
table.get 0
local.get 2
local.get 3
table.get 0
local.get 3
call $dealloc
local.get 4
call $a)
(func (;2;) (type 0)
f32.const 0x1p+0 (;=1;)
i32.const 2
i64.const 3
i32.const 4
i32.const 5
call $a externref shim)
(func $dealloc (type 1) (param i32))
(table (;0;) 32 externref)
(export "foo" (func 2)))
;)

View File

@ -0,0 +1,29 @@
;; @xform export "foo" () externref_owned
(module
(func $foo (export "foo") (result i32)
i32.const 0)
(func $alloc (export "__externref_table_alloc") (result i32)
i32.const 0)
(func $dealloc (export "__externref_table_dealloc") (param i32))
)
(; CHECK-ALL:
(module
(type (;0;) (func (result i32)))
(type (;1;) (func (result externref)))
(type (;2;) (func (param i32)))
(func $foo externref shim (type 1) (result externref)
(local i32)
call $foo
local.tee 0
table.get 0
local.get 0
call $dealloc)
(func $foo (type 0) (result i32)
i32.const 0)
(func $dealloc (type 2) (param i32))
(table (;0;) 32 externref)
(export "foo" (func $foo externref shim)))
;)

View File

@ -0,0 +1,37 @@
;; @xform export "foo" (externref_owned)
(module
(import "__wbindgen_externref_xform__" "__wbindgen_externref_table_grow"
(func $grow (param i32) (result i32)))
(func $foo (export "foo") (param i32)
i32.const 0
call $grow
drop)
(func $alloc (export "__externref_table_alloc") (result i32)
i32.const 0)
(func $dealloc (export "__externref_table_dealloc") (param i32))
)
(; CHECK-ALL:
(module
(type (;0;) (func (result i32)))
(type (;1;) (func (param i32)))
(type (;2;) (func (param externref)))
(func $foo externref shim (type 2) (param externref)
(local i32)
call $alloc
local.tee 1
local.get 0
table.set 0
local.get 1
call $foo)
(func $foo (type 1) (param i32)
ref.nullextern
i32.const 0
table.grow 0
drop)
(func $alloc (type 0) (result i32)
i32.const 0)
(table (;0;) 32 externref)
(export "foo" (func $foo externref shim)))
;)

View File

@ -0,0 +1,35 @@
;; @xform export "foo" (externref_owned)
(module
(import "__wbindgen_externref_xform__" "__wbindgen_externref_table_set_null"
(func $set-null (param i32)))
(func $foo (export "foo") (param i32)
local.get 0
call $set-null)
(func $alloc (export "__externref_table_alloc") (result i32)
i32.const 0)
(func $dealloc (export "__externref_table_dealloc") (param i32))
)
(; CHECK-ALL:
(module
(type (;0;) (func (result i32)))
(type (;1;) (func (param i32)))
(type (;2;) (func (param externref)))
(func $foo externref shim (type 2) (param externref)
(local i32)
call $alloc
local.tee 1
local.get 0
table.set 0
local.get 1
call $foo)
(func $foo (type 1) (param i32)
local.get 0
ref.nullextern
table.set 0)
(func $alloc (type 0) (result i32)
i32.const 0)
(table (;0;) 32 externref)
(export "foo" (func $foo externref shim)))
;)

View File

@ -0,0 +1,33 @@
;; @xform table 0 (externref_owned)
(module
(func $foo (param i32))
(table (export "func") 0 funcref)
(elem (i32.const 0) 0)
(func $alloc (export "__externref_table_alloc") (result i32)
i32.const 0)
(func $dealloc (export "__externref_table_dealloc") (param i32))
)
(; CHECK-ALL:
(module
(type (;0;) (func (result i32)))
(type (;1;) (func (param i32)))
(type (;2;) (func (param externref)))
(func $closure0 externref shim (type 2) (param externref)
(local i32)
call $alloc
local.tee 1
local.get 0
table.set 1
local.get 1
call $foo)
(func $alloc (type 0) (result i32)
i32.const 0)
(func $foo (type 1) (param i32))
(table (;0;) 2 funcref)
(table (;1;) 32 externref)
(export "func" (table 0))
(elem (;0;) (i32.const 0) func $foo)
(elem (;1;) (i32.const 1) func $closure0 externref shim))
;)