mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-07 08:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWasm: Use correct null check when getting iterator method
Some checks are pending
CI / Linux, x86_64, Fuzzers, Clang (push) Waiting to run
Details
CI / macOS, arm64, Sanitizer, Clang (push) Waiting to run
Details
CI / Linux, x86_64, Sanitizer, GNU (push) Waiting to run
Details
CI / Linux, x86_64, Sanitizer, Clang (push) Waiting to run
Details
Package the js repl as a binary artifact / Linux, arm64 (push) Waiting to run
Details
Package the js repl as a binary artifact / macOS, arm64 (push) Waiting to run
Details
Package the js repl as a binary artifact / Linux, x86_64 (push) Waiting to run
Details
Run test262 and test-wasm / run_and_update_results (push) Waiting to run
Details
Lint Code / lint (push) Waiting to run
Details
Label PRs with merge conflicts / auto-labeler (push) Waiting to run
Details
Push notes / build (push) Waiting to run
Details

Browse source
This commit is contained in:
Tim Ledbetter 2025-07-13 09:33:48 +01:00 • committed by Jelle Raaijmakers
commit cd0cadc5e1
Notes: github-actions[bot] 2025-07-13 09:29:23 +00:00
4 changed files with 175 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibWeb/WebAssembly/WebAssembly.cpp
View file

@ -291,7 +291,7 @@ JS::ThrowCompletionOr<NonnullOwnPtr<Wasm::ModuleInstance>> instantiate_module(JS
return Wasm::Result { Vector<Wasm::Value> { TRY_OR_RETURN_TRAP(to_webassembly_value(vm, result, type.results().first())) } }; return Wasm::Result { Vector<Wasm::Value> { TRY_OR_RETURN_TRAP(to_webassembly_value(vm, result, type.results().first())) } };
auto method = TRY_OR_RETURN_TRAP(result.get_method(vm, vm.names.iterator)); auto method = TRY_OR_RETURN_TRAP(result.get_method(vm, vm.names.iterator));
if (method == JS::js_undefined()) if (!method)
return Wasm::Trap::from_external_object(vm.throw_completion<JS::TypeError>(JS::ErrorType::NotIterable, result.to_string_without_side_effects())); return Wasm::Trap::from_external_object(vm.throw_completion<JS::TypeError>(JS::ErrorType::NotIterable, result.to_string_without_side_effects()));
auto values = TRY_OR_RETURN_TRAP(JS::iterator_to_list(vm, TRY_OR_RETURN_TRAP(JS::get_iterator_from_method(vm, result, *method)))); auto values = TRY_OR_RETURN_TRAP(JS::iterator_to_list(vm, TRY_OR_RETURN_TRAP(JS::get_iterator_from_method(vm, result, *method))));

9
Tests/LibWeb/Text/expected/wpt-import/wasm/jsapi/constructor/multi-value.any.txt Normal file
View file

@ -0,0 +1,9 @@
Harness status: OK
Found 3 tests
1 Pass
2 Fail
Fail multiple return values from wasm to js
Pass multiple return values inside wasm
Fail multiple return values from js to wasm

16
Tests/LibWeb/Text/input/wpt-import/wasm/jsapi/constructor/multi-value.any.html Normal file
View file

@ -0,0 +1,16 @@
<!doctype html>
<meta charset=utf-8>
<script>
self.GLOBAL = {
isWindow: function() { return true; },
isWorker: function() { return false; },
isShadowRealm: function() { return false; },
};
</script>
<script src="../../../resources/testharness.js"></script>
<script src="../../../resources/testharnessreport.js"></script>
<script src="../../../wasm/jsapi/wasm-module-builder.js"></script>
<script src="../../../wasm/jsapi/assertions.js"></script>
<div id=log></div>
<script src="../../../wasm/jsapi/constructor/multi-value.any.js"></script>

149
Tests/LibWeb/Text/input/wpt-import/wasm/jsapi/constructor/multi-value.any.js Normal file
View file

@ -0,0 +1,149 @@
// META: global=window,dedicatedworker,jsshell,shadowrealm
// META: script=/wasm/jsapi/wasm-module-builder.js
// META: script=/wasm/jsapi/assertions.js
const type_if_fi = makeSig([kWasmF64, kWasmI32], [kWasmI32, kWasmF64]);
promise_test(async () => {
const builder = new WasmModuleBuilder();
builder
.addFunction("swap", type_if_fi)
.addBody([
kExprLocalGet, 1,
kExprLocalGet, 0,
kExprReturn,
])
.exportFunc();
const buffer = builder.toBuffer();
const result = await WebAssembly.instantiate(buffer);
const swapped = result.instance.exports.swap(4.2, 7);
assert_true(Array.isArray(swapped));
assert_equals(Object.getPrototypeOf(swapped), Array.prototype);
assert_array_equals(swapped, [7, 4.2]);
}, "multiple return values from wasm to js");
promise_test(async () => {
const builder = new WasmModuleBuilder();
const swap = builder
.addFunction("swap", type_if_fi)
.addBody([
kExprLocalGet, 1,
kExprLocalGet, 0,
kExprReturn,
]);
builder
.addFunction("callswap", kSig_i_v)
.addBody([
...wasmF64Const(4.2),
...wasmI32Const(7),
kExprCallFunction, swap.index,
kExprDrop,
kExprReturn,
])
.exportFunc();
const buffer = builder.toBuffer();
const result = await WebAssembly.instantiate(buffer);
const swapped = result.instance.exports.callswap();
assert_equals(swapped, 7);
}, "multiple return values inside wasm");
promise_test(async () => {
const builder = new WasmModuleBuilder();
const fnIndex = builder.addImport("module", "fn", type_if_fi);
builder
.addFunction("callfn", kSig_i_v)
.addBody([
...wasmF64Const(4.2),
...wasmI32Const(7),
kExprCallFunction, fnIndex,
kExprDrop,
kExprReturn,
])
.exportFunc();
const buffer = builder.toBuffer();
const actual = [];
const imports = {
"module": {
fn(f32, i32) {
assert_equals(f32, 4.2);
assert_equals(i32, 7);
const result = [2, 7.3];
let i = 0;
return {
get [Symbol.iterator]() {
actual.push("@@iterator getter");
return function iterator() {
actual.push("@@iterator call");
return {
get next() {
actual.push("next getter");
return function next(...args) {
assert_array_equals(args, []);
let j = ++i;
actual.push(`next call ${j}`);
if (j > result.length) {
return {
get done() {
actual.push(`done call ${j}`);
return true;
}
};
}
return {
get done() {
actual.push(`done call ${j}`);
return false;
},
get value() {
actual.push(`value call ${j}`);
return {
get valueOf() {
actual.push(`valueOf get ${j}`);
return function() {
actual.push(`valueOf call ${j}`);
return result[j - 1];
};
}
};
}
};
};
}
};
}
},
};
},
}
};
const { instance } = await WebAssembly.instantiate(buffer, imports);
const result = instance.exports.callfn();
assert_equals(result, 2);
assert_array_equals(actual, [
"@@iterator getter",
"@@iterator call",
"next getter",
"next call 1",
"done call 1",
"value call 1",
"next call 2",
"done call 2",
"value call 2",
"next call 3",
"done call 3",
"valueOf get 1",
"valueOf call 1",
"valueOf get 2",
"valueOf call 2",
]);
}, "multiple return values from js to wasm");