cfa8d0b35a
This is a reland of commit e76ad5c6d9
Changes compared to original:
- Move invocation of LAZY_INSTANCE_INITIALIZER to a static global
variable, as some builds were failing with a function-level static.
- Drive-by: Improve documentation a bit.
Original change's description:
> [wasm-gc] Implement isorecursive canonicalization
>
> This implements isorecursive canonicalization for static types.
>
> Not implemented in this CL:
> - Runtime type canonicalization.
> - Cross-module signature canonicalization for purposes of call_indirect.
>
> Bug: v8:7748
> Change-Id: I6214f947444eea8d7b15a29b35c94c3d07ddb525
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3541925
> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#79665}
Bug: v8:7748
Change-Id: I493fba1906491762f7d8bae50108e3e4a743391d
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3560480
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Cr-Commit-Position: refs/heads/main@{#79692}
209 lines
7.1 KiB
JavaScript
209 lines
7.1 KiB
JavaScript
// Copyright 2020 the V8 project authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
// Flags: --experimental-wasm-gc
|
|
|
|
d8.file.execute('test/mjsunit/wasm/wasm-module-builder.js');
|
|
(function TestTables() {
|
|
print(arguments.callee.name);
|
|
var exporting_instance = (function() {
|
|
var builder = new WasmModuleBuilder();
|
|
var binary_type = builder.addType(kSig_i_ii);
|
|
|
|
builder.addFunction('addition', kSig_i_ii)
|
|
.addBody([kExprLocalGet, 0, kExprLocalGet, 1, kExprI32Add])
|
|
.exportFunc();
|
|
|
|
builder.addFunction('succ', kSig_i_i)
|
|
.addBody([kExprLocalGet, 0, kExprI32Const, 1, kExprI32Add])
|
|
.exportFunc();
|
|
|
|
builder.addTable(wasmOptRefType(binary_type), 1, 100).exportAs('table');
|
|
|
|
return builder.instantiate({});
|
|
})();
|
|
|
|
// Wrong type for imported table.
|
|
assertThrows(() => {
|
|
var builder = new WasmModuleBuilder();
|
|
var unary_type = builder.addType(kSig_i_i);
|
|
builder.addImportedTable(
|
|
'imports', 'table', 1, 100, wasmOptRefType(unary_type));
|
|
builder.instantiate({imports: {table: exporting_instance.exports.table}})
|
|
}, WebAssembly.LinkError, /imported table does not match the expected type/)
|
|
|
|
// Type for imported table must match exactly.
|
|
assertThrows(() => {
|
|
var builder = new WasmModuleBuilder();
|
|
builder.addImportedTable('imports', 'table', 1, 100, kWasmFuncRef);
|
|
builder.instantiate({imports: {table: exporting_instance.exports.table}})
|
|
}, WebAssembly.LinkError, /imported table does not match the expected type/)
|
|
|
|
var instance = (function() {
|
|
var builder = new WasmModuleBuilder();
|
|
|
|
var unary_type = builder.addType(kSig_i_i);
|
|
var binary_type = builder.addType(kSig_i_ii);
|
|
|
|
builder.addImportedTable(
|
|
'imports', 'table', 1, 100, wasmOptRefType(binary_type));
|
|
|
|
var table =
|
|
builder.addTable(wasmOptRefType(unary_type), 10).exportAs('table');
|
|
builder.addTable(kWasmFuncRef, 1).exportAs('generic_table');
|
|
|
|
builder
|
|
.addFunction(
|
|
'table_test', makeSig([wasmRefType(unary_type)], [kWasmI32]))
|
|
// Set table[0] to input function, then retrieve it and call it.
|
|
.addBody([
|
|
kExprI32Const, 0, kExprLocalGet, 0, kExprTableSet, table.index,
|
|
kExprI32Const, 42, kExprI32Const, 0, kExprTableGet, table.index,
|
|
kExprCallRef
|
|
])
|
|
.exportFunc();
|
|
|
|
// Same, but with table[1] and call_indirect
|
|
builder
|
|
.addFunction(
|
|
'table_indirect_test',
|
|
makeSig([wasmRefType(unary_type)], [kWasmI32]))
|
|
.addBody([
|
|
kExprI32Const, 1, kExprLocalGet, 0, kExprTableSet, table.index,
|
|
kExprI32Const, 42, kExprI32Const, 0, kExprCallIndirect, unary_type,
|
|
table.index
|
|
])
|
|
.exportFunc();
|
|
|
|
// Instantiate with a table of the correct type.
|
|
return builder.instantiate(
|
|
{imports: {table: exporting_instance.exports.table}});
|
|
})();
|
|
|
|
// This module is valid.
|
|
assertTrue(!!instance);
|
|
|
|
// The correct function reference is preserved when setting it to and getting
|
|
// it back from a table.
|
|
assertEquals(
|
|
43, instance.exports.table_test(exporting_instance.exports.succ));
|
|
// Same for call indirect (the indirect call tables are also set correctly).
|
|
assertEquals(
|
|
43,
|
|
instance.exports.table_indirect_test(exporting_instance.exports.succ));
|
|
|
|
// Setting from JS API respects types.
|
|
instance.exports.generic_table.set(0, exporting_instance.exports.succ);
|
|
instance.exports.table.set(0, exporting_instance.exports.succ);
|
|
assertThrows(
|
|
() => instance.exports.table.set(0, exporting_instance.exports.addition),
|
|
TypeError,
|
|
/Argument 1 is invalid for table of type \(ref null 0\)/);
|
|
})();
|
|
|
|
(function TestNonNullableTables() {
|
|
print(arguments.callee.name);
|
|
var builder = new WasmModuleBuilder();
|
|
|
|
var binary_type = builder.addType(kSig_i_ii);
|
|
|
|
var addition = builder.addFunction('addition', binary_type).addBody([
|
|
kExprLocalGet, 0, kExprLocalGet, 1, kExprI32Add
|
|
]);
|
|
var subtraction =
|
|
builder.addFunction('subtraction', binary_type)
|
|
.addBody([kExprLocalGet, 0, kExprLocalGet, 1, kExprI32Sub])
|
|
.exportFunc();
|
|
|
|
var table = builder.addTable(wasmRefType(binary_type), 3, 3,
|
|
WasmInitExpr.RefFunc(addition.index));
|
|
|
|
builder.addFunction('init', kSig_v_v)
|
|
.addBody([
|
|
kExprI32Const, 1, kExprRefFunc, subtraction.index, kExprTableSet,
|
|
table.index
|
|
])
|
|
.exportFunc();
|
|
|
|
// (index, arg1, arg2) -> table[index](arg1, arg2)
|
|
builder.addFunction('table_test', kSig_i_iii)
|
|
.addBody([
|
|
kExprLocalGet, 1, kExprLocalGet, 2, kExprLocalGet, 0, kExprCallIndirect,
|
|
binary_type, table.index
|
|
])
|
|
.exportFunc();
|
|
|
|
var instance = builder.instantiate({});
|
|
|
|
assertTrue(!!instance);
|
|
|
|
instance.exports.init();
|
|
assertEquals(44, instance.exports.table_test(0, 33, 11));
|
|
assertEquals(22, instance.exports.table_test(1, 33, 11));
|
|
})();
|
|
|
|
(function TestAnyRefTable() {
|
|
print(arguments.callee.name);
|
|
let builder = new WasmModuleBuilder();
|
|
|
|
let unary_type = builder.addType(kSig_i_i);
|
|
let binary_type = builder.addType(kSig_i_ii);
|
|
let struct_type = builder.addStruct([makeField(kWasmI32, false)]);
|
|
|
|
let successor = builder.addFunction('addition', unary_type)
|
|
.addBody([kExprLocalGet, 0, kExprI32Const, 1, kExprI32Add]);
|
|
|
|
let subtraction = builder.addFunction('subtraction', binary_type)
|
|
.addBody([kExprLocalGet, 0, kExprLocalGet, 1, kExprI32Sub])
|
|
|
|
let table = builder.addTable(kWasmAnyRef, 4, 4);
|
|
builder.addActiveElementSegment(
|
|
table, WasmInitExpr.I32Const(0),
|
|
[WasmInitExpr.RefFunc(successor.index),
|
|
WasmInitExpr.RefFunc(subtraction.index),
|
|
WasmInitExpr.StructNew(struct_type, [WasmInitExpr.I32Const(10)]),
|
|
WasmInitExpr.RefNull(kWasmEqRef)],
|
|
kWasmAnyRef);
|
|
|
|
// return static_cast<i->i>(table[0])(local_0)
|
|
builder.addFunction("f0_getter", kSig_i_i)
|
|
.addBody([
|
|
kExprLocalGet, 0,
|
|
kExprI32Const, 0, kExprTableGet, 0,
|
|
kGCPrefix, kExprRefAsFunc, kGCPrefix, kExprRefCastStatic, unary_type,
|
|
kExprCallRef])
|
|
.exportFunc();
|
|
|
|
// return static_cast<(i,i)->i>(table[1])(local_0, local_1)
|
|
builder.addFunction("f1_getter", kSig_i_ii)
|
|
.addBody([
|
|
kExprLocalGet, 0, kExprLocalGet, 1,
|
|
kExprI32Const, 1, kExprTableGet, 0,
|
|
kGCPrefix, kExprRefAsFunc, kGCPrefix, kExprRefCastStatic, binary_type,
|
|
kExprCallRef])
|
|
.exportFunc();
|
|
|
|
// return static_cast<struct_type>(table[2]).field_0
|
|
builder.addFunction("struct_getter", kSig_i_v)
|
|
.addBody([
|
|
kExprI32Const, 2, kExprTableGet, 0,
|
|
kGCPrefix, kExprRefAsData, kGCPrefix, kExprRefCastStatic, struct_type,
|
|
kGCPrefix, kExprStructGet, struct_type, 0])
|
|
.exportFunc();
|
|
|
|
// return table[3] == null
|
|
builder.addFunction("null_getter", kSig_i_v)
|
|
.addBody([kExprI32Const, 3, kExprTableGet, 0, kExprRefIsNull])
|
|
.exportFunc();
|
|
|
|
let instance = builder.instantiate({});
|
|
|
|
assertTrue(!!instance);
|
|
|
|
assertEquals(43, instance.exports.f0_getter(42));
|
|
assertEquals(-7, instance.exports.f1_getter(12, 19));
|
|
assertEquals(10, instance.exports.struct_getter());
|
|
assertEquals(1, instance.exports.null_getter());
|
|
})();
|