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

@ -24,7 +24,7 @@ rouille = { version = "3.0.0", default-features = false }
serde = { version = "1.0", features = ['derive'] }
serde_derive = "1.0"
serde_json = "1.0"
walrus = { version = "0.16.0", features = ['parallel'] }
walrus = { version = "0.17.0", features = ['parallel'] }
wasm-bindgen-cli-support = { path = "../cli-support", version = "=0.2.62" }
wasm-bindgen-shared = { path = "../shared", version = "=0.2.62" }
@ -34,11 +34,11 @@ diff = "0.1"
predicates = "1.0.0"
rayon = "1.0"
tempfile = "3.0"
walrus = "0.16"
wit-printer = "0.1"
wit-text = "0.6"
wit-validator = "0.1"
wit-walrus = "0.2"
walrus = "0.17"
wit-printer = "0.2"
wit-text = "0.7"
wit-validator = "0.2"
wit-walrus = "0.4"
[[test]]
name = "reference"

View File

@ -1,26 +1,26 @@
(module
(func $foo (param anyref) (result anyref)
(func $foo (param externref) (result externref)
local.get 0)
(func $store (param anyref)
(func $store (param externref)
i32.const 0
local.get 0
table.set 0)
(func $load (result anyref)
(func $load (result externref)
i32.const 0
table.get 0)
(table 1 anyref)
(table 1 externref)
(@interface func (export "foo") (param anyref) (result anyref)
(@interface func (export "foo") (param externref) (result externref)
arg.get 0
call-core $foo)
(@interface func (export "store") (param anyref)
(@interface func (export "store") (param externref)
arg.get 0
call-core $store)
(@interface func (export "load") (result anyref)
(@interface func (export "load") (result externref)
call-core $load)
)

View File

@ -98,8 +98,8 @@ fn runtest(test: &Path) -> Result<()> {
.arg(td.path())
.arg(&wasm)
.arg("--no-typescript");
if contents.contains("// enable-anyref") {
bindgen.env("WASM_BINDGEN_ANYREF", "1");
if contents.contains("// enable-externref") {
bindgen.env("WASM_BINDGEN_EXTERNREF", "1");
}
if interface_types {
bindgen.env("WASM_INTERFACE_TYPES", "1");

View File

@ -1,6 +1,6 @@
import * as wasm from './reference_test_bg.wasm';
export const __wbindgen_init_anyref_table = function() {
export const __wbindgen_init_externref_table = function() {
const table = wasm.__wbindgen_export_0;
const offset = table.grow(4);
table.set(0, undefined);

View File

@ -1 +1 @@
// enable-anyref
// enable-externref

View File

@ -1,6 +1,6 @@
(module
(type (;0;) (func))
(import "./reference_test_bg.js" "__wbindgen_init_anyref_table" (func (;0;) (type 0)))
(import "./reference_test_bg.js" "__wbindgen_init_externref_table" (func (;0;) (type 0)))
(table (;0;) 32 externref)
(memory (;0;) 16)
(export "memory" (memory 0))

View File

@ -18,8 +18,8 @@ function getStringFromWasm0(ptr, len) {
return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
}
function addToAnyrefTable0(obj) {
const idx = wasm.__anyref_table_alloc();
function addToExternrefTable0(obj) {
const idx = wasm.__externref_table_alloc();
wasm.__wbindgen_export_0.set(idx, obj);
return idx;
}
@ -30,7 +30,7 @@ function handleError(f) {
return f.apply(this, arguments);
} catch (e) {
const idx = addToAnyrefTable0(e);
const idx = addToExternrefTable0(e);
wasm.__wbindgen_exn_store(idx);
}
};
@ -53,7 +53,7 @@ export const __wbindgen_rethrow = function(arg0) {
throw arg0;
};
export const __wbindgen_init_anyref_table = function() {
export const __wbindgen_init_externref_table = function() {
const table = wasm.__wbindgen_export_0;
const offset = table.grow(4);
table.set(0, undefined);

View File

@ -1,4 +1,4 @@
// enable-anyref
// enable-externref
use wasm_bindgen::prelude::*;

View File

@ -2,9 +2,9 @@
(type (;0;) (func))
(type (;1;) (func (result i32)))
(type (;2;) (func (param i32)))
(import "./reference_test_bg.js" "__wbindgen_init_anyref_table" (func (;0;) (type 0)))
(import "./reference_test_bg.js" "__wbindgen_init_externref_table" (func (;0;) (type 0)))
(func $__wbindgen_exn_store (type 2) (param i32))
(func $__anyref_table_alloc (type 1) (result i32))
(func $__externref_table_alloc (type 1) (result i32))
(func $exported (type 0))
(table (;0;) 32 externref)
(memory (;0;) 17)
@ -12,5 +12,5 @@
(export "exported" (func $exported))
(export "__wbindgen_export_0" (table 0))
(export "__wbindgen_exn_store" (func $__wbindgen_exn_store))
(export "__anyref_table_alloc" (func $__anyref_table_alloc))
(export "__externref_table_alloc" (func $__externref_table_alloc))
(export "__wbindgen_start" (func 0)))

View File

@ -6,7 +6,7 @@ export function foo() {
wasm.foo();
}
export const __wbindgen_init_anyref_table = function() {
export const __wbindgen_init_externref_table = function() {
const table = wasm.__wbindgen_export_0;
const offset = table.grow(4);
table.set(0, undefined);

View File

@ -1,4 +1,4 @@
// enable-anyref
// enable-externref
use wasm_bindgen::prelude::*;

View File

@ -1,6 +1,6 @@
(module
(type (;0;) (func))
(import "./reference_test_bg.js" "__wbindgen_init_anyref_table" (func (;0;) (type 0)))
(import "./reference_test_bg.js" "__wbindgen_init_externref_table" (func (;0;) (type 0)))
(func $foo (type 0))
(table (;0;) 32 externref)
(memory (;0;) 17)

View File

@ -3,6 +3,6 @@
use wasm_bindgen::prelude::*;
#[wasm_bindgen]
pub fn anyref_in_out(a: &JsValue, b: JsValue) -> JsValue {
pub fn externref_in_out(a: &JsValue, b: JsValue) -> JsValue {
b
}

View File

@ -1,12 +1,12 @@
(module
(type (;0;) (func (param externref externref) (result externref)))
(func $anyref_in_out anyref shim (type 0) (param externref externref) (result externref))
(func $externref_in_out externref shim (type 0) (param externref externref) (result externref))
(memory (;0;) 17)
(export "memory" (memory 0))
(export "anyref_in_out" (func $anyref_in_out anyref shim))
(@interface type (;0;) (func (param anyref) (param anyref) (result anyref)))
(export "externref_in_out" (func $externref_in_out externref shim))
(@interface type (;0;) (func (param externref) (param externref) (result externref)))
(@interface func (;0;) (type 0)
arg.get 0
arg.get 1
call-core $anyref_in_out anyref shim)
(@interface export "anyref_in_out" (func 0)))
call-core $externref_in_out externref shim)
(@interface export "externref_in_out" (func 0)))