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}
286 lines
9.2 KiB
JavaScript
286 lines
9.2 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 TestReferenceGlobals() {
|
|
print(arguments.callee.name);
|
|
|
|
var exporting_instance = (function() {
|
|
var builder = new WasmModuleBuilder();
|
|
|
|
var sig_index = builder.addType(kSig_i_ii);
|
|
var wrong_sig_index = builder.addType(kSig_i_i);
|
|
|
|
var addition_index = builder.addFunction("addition", sig_index)
|
|
.addBody([kExprLocalGet, 0, kExprLocalGet, 1, kExprI32Add])
|
|
.exportFunc();
|
|
|
|
builder.addGlobal(wasmRefType(sig_index), false,
|
|
WasmInitExpr.RefFunc(addition_index))
|
|
.exportAs("global");
|
|
builder.addGlobal(wasmOptRefType(wrong_sig_index), false)
|
|
.exportAs("mistyped_global");
|
|
|
|
return builder.instantiate({});
|
|
})();
|
|
|
|
// Mistyped imported global.
|
|
assertThrows(
|
|
() => {
|
|
var builder = new WasmModuleBuilder();
|
|
var sig_index = builder.addType(kSig_i_ii);
|
|
builder.addImportedGlobal("imports", "global", wasmOptRefType(sig_index),
|
|
false);
|
|
builder.instantiate(
|
|
{imports: { global: exporting_instance.exports.mistyped_global }})},
|
|
WebAssembly.LinkError,
|
|
/imported global does not match the expected type/
|
|
);
|
|
|
|
// Mistyped imported global due to cross-module typechecking.
|
|
assertThrows(
|
|
() => {
|
|
var builder = new WasmModuleBuilder();
|
|
var sig_index = builder.addType(kSig_i_i);
|
|
builder.addImportedGlobal("imports", "global", wasmOptRefType(sig_index),
|
|
false);
|
|
builder.instantiate(
|
|
{imports: { global: exporting_instance.exports.global }})},
|
|
WebAssembly.LinkError,
|
|
/imported global does not match the expected type/
|
|
);
|
|
|
|
// Non-function imported into function-typed global.
|
|
assertThrows(
|
|
() => {
|
|
var builder = new WasmModuleBuilder();
|
|
var sig_index = builder.addType(kSig_i_ii);
|
|
builder.addImportedGlobal("imports", "global", wasmOptRefType(sig_index),
|
|
false);
|
|
builder.instantiate({imports: { global: 42 }})},
|
|
WebAssembly.LinkError,
|
|
/function-typed object must be null \(if nullable\) or a Wasm function object/
|
|
);
|
|
|
|
// Mistyped function import.
|
|
assertThrows(
|
|
() => {
|
|
var builder = new WasmModuleBuilder();
|
|
var sig_index = builder.addType(kSig_i_i);
|
|
builder.addImportedGlobal("imports", "global", wasmRefType(sig_index),
|
|
false);
|
|
builder.instantiate(
|
|
{imports: { global: exporting_instance.exports.addition }})},
|
|
WebAssembly.LinkError,
|
|
/assigned exported function has to be a subtype of the expected type/
|
|
);
|
|
|
|
var instance = (function () {
|
|
var builder = new WasmModuleBuilder();
|
|
|
|
var sig_index = builder.addType(kSig_i_ii);
|
|
|
|
builder.addImportedGlobal("imports", "global", wasmOptRefType(sig_index),
|
|
false);
|
|
|
|
builder.addFunction("test_import", kSig_i_ii)
|
|
.addBody([kExprLocalGet, 0, kExprLocalGet, 1, kExprGlobalGet, 0,
|
|
kExprCallRef])
|
|
.exportFunc();
|
|
|
|
return builder.instantiate({imports: {
|
|
global: exporting_instance.exports.global
|
|
}});
|
|
})();
|
|
|
|
// This module is valid.
|
|
assertFalse(instance === undefined);
|
|
assertFalse(instance === null);
|
|
assertFalse(instance === 0);
|
|
|
|
// The correct function reference has been passed.
|
|
assertEquals(66, instance.exports.test_import(42, 24));
|
|
})();
|
|
|
|
(function TestStructInitExpr() {
|
|
print(arguments.callee.name);
|
|
|
|
var builder = new WasmModuleBuilder();
|
|
var struct_index = builder.addStruct([{type: kWasmI32, mutability: false}]);
|
|
var composite_struct_index = builder.addStruct(
|
|
[{type: kWasmI32, mutability: false},
|
|
{type: wasmOptRefType(struct_index), mutability: false},
|
|
{type: kWasmI8, mutability: true}]);
|
|
|
|
let field1_value = 432;
|
|
let field2_value = -123;
|
|
let field3_value = -555;
|
|
|
|
var global0 = builder.addGlobal(
|
|
wasmRefType(struct_index), false,
|
|
WasmInitExpr.StructNewWithRtt(
|
|
struct_index,
|
|
[WasmInitExpr.I32Const(field2_value),
|
|
WasmInitExpr.RttCanon(struct_index)]));
|
|
|
|
var global = builder.addGlobal(
|
|
wasmRefType(composite_struct_index), false,
|
|
WasmInitExpr.StructNewWithRtt(
|
|
composite_struct_index,
|
|
[WasmInitExpr.I32Const(field1_value),
|
|
WasmInitExpr.GlobalGet(global0.index),
|
|
WasmInitExpr.I32Const(field3_value),
|
|
WasmInitExpr.RttCanon(composite_struct_index)]));
|
|
|
|
var global_default = builder.addGlobal(
|
|
wasmRefType(composite_struct_index), false,
|
|
WasmInitExpr.StructNewDefaultWithRtt(
|
|
composite_struct_index,
|
|
WasmInitExpr.RttCanon(composite_struct_index)));
|
|
|
|
builder.addFunction("field_1", kSig_i_v)
|
|
.addBody([
|
|
kExprGlobalGet, global.index,
|
|
kGCPrefix, kExprStructGet, composite_struct_index, 0
|
|
])
|
|
.exportFunc();
|
|
|
|
builder.addFunction("field_2", kSig_i_v)
|
|
.addBody([
|
|
kExprGlobalGet, global.index,
|
|
kGCPrefix, kExprStructGet, composite_struct_index, 1,
|
|
kGCPrefix, kExprStructGet, struct_index, 0
|
|
])
|
|
.exportFunc();
|
|
|
|
builder.addFunction("field_3", kSig_i_v)
|
|
.addBody([
|
|
kExprGlobalGet, global.index,
|
|
kGCPrefix, kExprStructGetS, composite_struct_index, 2])
|
|
.exportFunc();
|
|
|
|
builder.addFunction("field_1_default", kSig_i_v)
|
|
.addBody([
|
|
kExprGlobalGet, global_default.index,
|
|
kGCPrefix, kExprStructGet, composite_struct_index, 0])
|
|
.exportFunc();
|
|
|
|
builder.addFunction("field_2_default", makeSig([], [kWasmAnyRef]))
|
|
.addBody([
|
|
kExprGlobalGet, global_default.index,
|
|
kGCPrefix, kExprStructGet, composite_struct_index, 1])
|
|
.exportFunc();
|
|
|
|
builder.addFunction("field_3_default", kSig_i_v)
|
|
.addBody([
|
|
kExprGlobalGet, global_default.index,
|
|
kGCPrefix, kExprStructGetS, composite_struct_index, 2])
|
|
.exportFunc();
|
|
|
|
var instance = builder.instantiate({});
|
|
|
|
assertEquals(field1_value, instance.exports.field_1());
|
|
assertEquals(field2_value, instance.exports.field_2());
|
|
assertEquals((field3_value << 24) >> 24, instance.exports.field_3());
|
|
assertEquals(0, instance.exports.field_1_default());
|
|
assertEquals(null, instance.exports.field_2_default());
|
|
assertEquals(0, instance.exports.field_3_default());
|
|
})();
|
|
|
|
(function TestArrayInitExprNumeric() {
|
|
print(arguments.callee.name);
|
|
|
|
var builder = new WasmModuleBuilder();
|
|
var array_index = builder.addArray(kWasmI16, true);
|
|
|
|
let element0_value = -44;
|
|
let element1_value = 55;
|
|
|
|
var global0 = builder.addGlobal(
|
|
kWasmI32, false,
|
|
WasmInitExpr.I32Const(element0_value));
|
|
|
|
var global = builder.addGlobal(
|
|
wasmRefType(array_index), false,
|
|
WasmInitExpr.ArrayInit(
|
|
array_index,
|
|
[WasmInitExpr.GlobalGet(global0.index),
|
|
WasmInitExpr.I32Const(element1_value),
|
|
WasmInitExpr.RttCanon(array_index)]));
|
|
|
|
builder.addFunction("get_element", kSig_i_i)
|
|
.addBody([
|
|
kExprGlobalGet, global.index,
|
|
kExprLocalGet, 0,
|
|
kGCPrefix, kExprArrayGetS, array_index])
|
|
.exportFunc();
|
|
|
|
var instance = builder.instantiate({});
|
|
|
|
assertEquals(element0_value, instance.exports.get_element(0));
|
|
assertEquals(element1_value, instance.exports.get_element(1));
|
|
})();
|
|
|
|
(function TestArrayInitExprRef() {
|
|
print(arguments.callee.name);
|
|
|
|
var builder = new WasmModuleBuilder();
|
|
var struct_index = builder.addStruct([{type: kWasmI32, mutability: false}]);
|
|
var array_index = builder.addArray(wasmOptRefType(struct_index), true);
|
|
|
|
let element0_value = 44;
|
|
let element2_value = 55;
|
|
|
|
var global0 = builder.addGlobal(
|
|
wasmRefType(struct_index), false,
|
|
WasmInitExpr.StructNewWithRtt(
|
|
struct_index,
|
|
[WasmInitExpr.I32Const(element0_value),
|
|
WasmInitExpr.RttCanon(struct_index)]));
|
|
|
|
var global = builder.addGlobal(
|
|
wasmRefType(array_index), false,
|
|
WasmInitExpr.ArrayInit(
|
|
array_index,
|
|
[WasmInitExpr.GlobalGet(global0.index),
|
|
WasmInitExpr.RefNull(struct_index),
|
|
WasmInitExpr.StructNewWithRtt(
|
|
struct_index,
|
|
[WasmInitExpr.I32Const(element2_value),
|
|
WasmInitExpr.RttCanon(struct_index)]),
|
|
WasmInitExpr.RttCanon(array_index)]));
|
|
|
|
builder.addFunction("element0", kSig_i_v)
|
|
.addBody([
|
|
kExprGlobalGet, global.index,
|
|
kExprI32Const, 0,
|
|
kGCPrefix, kExprArrayGet, array_index,
|
|
kGCPrefix, kExprStructGet, struct_index, 0])
|
|
.exportFunc();
|
|
|
|
builder.addFunction("element1", makeSig([], [kWasmAnyRef]))
|
|
.addBody([
|
|
kExprGlobalGet, global.index,
|
|
kExprI32Const, 1,
|
|
kGCPrefix, kExprArrayGet, array_index])
|
|
.exportFunc();
|
|
|
|
builder.addFunction("element2", kSig_i_v)
|
|
.addBody([
|
|
kExprGlobalGet, global.index,
|
|
kExprI32Const, 2,
|
|
kGCPrefix, kExprArrayGet, array_index,
|
|
kGCPrefix, kExprStructGet, struct_index, 0])
|
|
.exportFunc();
|
|
|
|
var instance = builder.instantiate({});
|
|
|
|
assertEquals(element0_value, instance.exports.element0());
|
|
assertEquals(null, instance.exports.element1());
|
|
assertEquals(element2_value, instance.exports.element2());
|
|
})();
|