40ad911657
This is a reland of 6227c95e5f
Fixes compared to original landing:
- Decode a WASM_TO_JS_FUNCTION Code object as a WASM_TO_JS frame.
- Enable call_ref on WasmJSFunctions with arity mismatch.
- Use builtin pointer in BuildWasmToJSWrapper, to avoid having to
resolve the relocatable constant.
Original change's description:
> [wasm-gc] Implement call_ref on WasmJSFunction
>
> Changes:
> - Introduce turbofan builtin WasmAllocatePair.
> - Implement call_ref for WasmJSFunction in wasm-compiler.cc.
> - Remove WasmJSFunction trap.
> - Improve and extend call-ref.js test.
>
> Bug: v8:9495
> Change-Id: I8b4d1ab70cbbe9ae37887a6241d409eec638fd28
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2463226
> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
> Reviewed-by: Clemens Backes <clemensb@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#70535}
Bug: v8:9495
Cq-Include-Trybots: luci.v8.try:v8_mac64_gc_stress_dbg_ng
Cq-Include-Trybots: luci.v8.try:v8_linux_gc_stress_dbg_ng
Change-Id: I294947059e612d417d92614a43cb7383cd5f3b92
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2476314
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#70719}
118 lines
4.1 KiB
JavaScript
118 lines
4.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-type-reflection --experimental-wasm-gc
|
|
|
|
load("test/mjsunit/wasm/wasm-module-builder.js");
|
|
|
|
(function Test1() {
|
|
var exporting_instance = (function () {
|
|
var builder = new WasmModuleBuilder();
|
|
|
|
builder.addFunction("addition", kSig_i_ii)
|
|
.addBody([kExprLocalGet, 0, kExprLocalGet, 1, kExprI32Add])
|
|
.exportFunc();
|
|
|
|
return builder.instantiate({});
|
|
})();
|
|
|
|
var instance = (function () {
|
|
var builder = new WasmModuleBuilder();
|
|
|
|
var sig_index = builder.addType(kSig_i_ii);
|
|
|
|
var imported_js_api_function_index =
|
|
builder.addImport("imports", "js_api_mul", sig_index);
|
|
|
|
var imported_js_function_index =
|
|
builder.addImport("imports", "js_add", sig_index);
|
|
|
|
var imported_wasm_function_index =
|
|
builder.addImport("imports", "wasm_add", sig_index);
|
|
|
|
|
|
var locally_defined_function =
|
|
builder.addFunction("sub", sig_index)
|
|
.addBody([kExprLocalGet, 0, kExprLocalGet, 1, kExprI32Sub])
|
|
.exportFunc();
|
|
|
|
builder.addFunction("main", makeSig(
|
|
[wasmRefType(sig_index), kWasmI32, kWasmI32], [kWasmI32]))
|
|
.addBody([kExprLocalGet, 1, kExprLocalGet, 2, kExprLocalGet, 0,
|
|
kExprCallRef])
|
|
.exportFunc();
|
|
|
|
builder.addFunction("test_local", kSig_i_v)
|
|
.addBody([kExprI32Const, 55, kExprI32Const, 42,
|
|
kExprRefFunc, locally_defined_function.index, kExprCallRef])
|
|
.exportFunc();
|
|
|
|
builder.addFunction("test_js_import", kSig_i_v)
|
|
.addBody([kExprI32Const, 15, kExprI32Const, 42,
|
|
kExprRefFunc, imported_js_function_index, kExprCallRef])
|
|
.exportFunc();
|
|
|
|
builder.addFunction("test_wasm_import", kSig_i_v)
|
|
.addBody([kExprI32Const, 15, kExprI32Const, 42,
|
|
kExprRefFunc, imported_wasm_function_index, kExprCallRef])
|
|
.exportFunc();
|
|
|
|
builder.addFunction("test_js_api_import", kSig_i_v)
|
|
.addBody([kExprI32Const, 3, kExprI32Const, 7,
|
|
kExprRefFunc, imported_js_api_function_index,
|
|
kExprCallRef])
|
|
.exportFunc();
|
|
|
|
builder.addExport("reexported_js_function", imported_js_function_index);
|
|
|
|
// Just to make these functions eligible for call_ref.
|
|
builder.addDeclarativeElementSegment([imported_wasm_function_index,
|
|
imported_js_api_function_index]);
|
|
|
|
return builder.instantiate({imports: {
|
|
js_add: function(a, b) { return a + b; },
|
|
wasm_add: exporting_instance.exports.addition,
|
|
js_api_mul: new WebAssembly.Function(
|
|
{parameters:['i32', 'i32'], results: ['i32']},
|
|
function(a, b) { return a * b; })
|
|
}});
|
|
})();
|
|
|
|
// Check that the modules exist.
|
|
assertTrue(!!exporting_instance);
|
|
assertTrue(!!instance);
|
|
|
|
print("--locally defined func--");
|
|
assertEquals(13, instance.exports.test_local());
|
|
print("--locally defined exported func--")
|
|
assertEquals(5, instance.exports.main(instance.exports.sub, 12, 7));
|
|
|
|
print("--imported js func--");
|
|
assertEquals(57, instance.exports.test_js_import());
|
|
print("--imported and reexported js func--")
|
|
assertEquals(19, instance.exports.main(
|
|
instance.exports.reexported_js_function, 12, 7));
|
|
|
|
print("--imported function from another module--");
|
|
assertEquals(57, instance.exports.test_wasm_import());
|
|
print("--not imported function defined in another module--");
|
|
assertEquals(19, instance.exports.main(
|
|
exporting_instance.exports.addition, 12, 7));
|
|
|
|
print("--imported WebAssembly.Function--")
|
|
assertEquals(21, instance.exports.test_js_api_import());
|
|
print("--not imported WebAssembly.Function--")
|
|
assertEquals(-5, instance.exports.main(
|
|
new WebAssembly.Function(
|
|
{parameters:['i32', 'i32'], results: ['i32']},
|
|
function(a, b) { return a - b; }),
|
|
10, 15));
|
|
print("--not imported WebAssembly.Function, arity mismatch--")
|
|
assertEquals(100, instance.exports.main(
|
|
new WebAssembly.Function(
|
|
{parameters:['i32', 'i32'], results: ['i32']},
|
|
function(a) { return a * a; }),
|
|
10, 15));
|
|
})();
|