Merge branch 'main' of https://github.com/WebKit/WebKit

Author: actions-user

Configurations/Version.xcconfig

@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 620;
 MINOR_VERSION = 1;
-TINY_VERSION = 4;
+TINY_VERSION = 5;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);

JSTests/stress/atomics-ops-sign-extend-not-bit-mask.js

@@ -0,0 +1,48 @@
+//@ requireOptions("--jitPolicyScale=0.001")
+
+function opt16() {
+    const arr = new Int16Array([-1, 1]);
+    if (Atomics.and(arr, 0, 0) !== -1)
+        throw new Error();
+
+    if (Atomics.and(arr, 1, 0) !== 1)
+        throw new Error();
+}
+noInline(opt16);
+
+function optU16() {
+    const arr = new Uint16Array([-1, 1]);
+    if (Atomics.and(arr, 0, 0) !== 65535)
+        throw new Error();
+
+    if (Atomics.and(arr, 1, 0) !== 1)
+        throw new Error();
+}
+noInline(optU16);
+
+function opt8() {
+    const arr = new Int8Array([-1, 1]);
+    if (Atomics.and(arr, 0, 0) !== -1)
+        throw new Error();
+
+    if (Atomics.and(arr, 1, 0) !== 1)
+        throw new Error();
+}
+noInline(opt8);
+
+function optU8() {
+    const arr = new Uint8Array([-1, 1]);
+    if (Atomics.and(arr, 0, 0) !== 255)
+        throw new Error();
+
+    if (Atomics.and(arr, 1, 0) !== 1)
+        throw new Error();
+}
+noInline(optU8);
+
+for (let i = 0; i < 1e3; i++) {
+    opt16();
+    optU16();
+    opt8();
+    optU8();
+}

JSTests/stress/runString-returns-globalThis-not-globalObject.js

@@ -0,0 +1,33 @@
+// This shouldn't crash.
+
+try {
+    function F() {
+        return runString();
+    }
+    class C extends F {
+        "undefined" = this;
+    }
+    new C();
+} catch { }
+
+var custom = $vm.createCustomTestGetterSetter();
+
+try {
+    function F2() {
+        return $vm.custom.customAccessorGlobalObject;
+    }
+    class C2 extends F2 {
+        "undefined" = this;
+    }
+    new C2();
+} catch { }
+
+try {
+    function F3() {
+        return $vm.custom.customValueGlobalObject;
+    }
+    class C3 extends F3 {
+        "undefined" = this;
+    }
+    new C3();
+} catch { }

JSTests/wasm/simd-spec-tests/simd_linking.wast.js

@@ -0,0 +1,9 @@
+
+// simd_linking.wast:1
+let $1 = instance("\x00\x61\x73\x6d\x01\x00\x00\x00\x06\xab\x80\x80\x80\x00\x02\x7b\x00\xfd\x0c\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x7b\x01\xfd\x0c\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b\x07\x94\x80\x80\x80\x00\x02\x06\x67\x2d\x76\x31\x32\x38\x03\x00\x07\x6d\x67\x2d\x76\x31\x32\x38\x03\x01");
+
+// simd_linking.wast:5
+register("Mv128", $1)
+
+// simd_linking.wast:7
+let $2 = instance("\x00\x61\x73\x6d\x01\x00\x00\x00\x02\x92\x80\x80\x80\x00\x01\x05\x4d\x76\x31\x32\x38\x07\x6d\x67\x2d\x76\x31\x32\x38\x03\x7b\x01");

JSTests/wasm/stress/cc-int-to-int-memory.js

@@ -15,9 +15,58 @@ let wat = `
 )
 `
 
+let wat2 = `
+(module
+    (type $sig_test (func (param i32) (result i32)))
+    (import "o" "tbl" (table $t 1 funcref))
+    (import "o" "test" (func $test (param $x i32) (result i32)))
+    (import "o" "callee" (func $callee (param $x i32) (result i32)))
+
+    (memory 1)
+
+    (data (i32.const 0) "\\3B")
+
+    (func $test2 (export "test2") (param $x i32) (result i32)
+        (i32.add (local.get $x) (i32.load (i32.const 0)))
+    )
+
+    (func $test3 (export "test3") (param $x i32) (result i32)
+        (i32.add (local.get $x) (i32.load (i32.const 0)))
+    )
+
+    (func (export "test_with_call") (param $x i32) (result i32)
+        (i32.load (i32.const 0))
+        (call $test (i32.const 1))
+        (i32.load (i32.const 0))
+        (i32.add)
+        (i32.add)
+    )
+
+    (func (export "test_with_call_to_js") (param $x i32) (result i32)
+        (i32.load (i32.const 0))
+        (call $test (i32.const 1))
+        (i32.load (i32.const 0))
+        (i32.const 5)
+        (call $callee)
+        (i32.load (i32.const 0))
+        (i32.add)
+        (i32.add)
+        (i32.add)
+        (i32.add)
+    )
+)
+`
+
 async function test() {
     const instance = await instantiate(wat, {}, { simd: true })
     const { test } = instance.exports
+    let tbl = new WebAssembly.Table({ initial: 1, element: "funcref" })
+    tbl.set(0, test)
+    function callee(x) {
+        return x + test();
+    }
+    const instance2 = await instantiate(wat2, { o: { test, tbl, callee } }, { simd: true })
+    const { test2, test3, test_with_call, test_with_call_to_js } = instance2.exports
 
     for (let i = 0; i < 10000; ++i) {
         assert.eq(test(5), 42 + 5)
@@ -27,6 +76,10 @@ async function test() {
         assert.eq(test({ }, 10), 42 + 0)
         assert.eq(test(20.1, 10), 42 + 20)
         assert.eq(test(10, 20.1), 42 + 10)
+
+        assert.eq(test2(5), 59 + 5)
+        assert.eq(test_with_call(1), 59 + 59 + 42 + 1)
+        assert.eq(test_with_call_to_js(1), 59 + 59 + 59 + 42 + 1 + 5 + 42)
     }
 }
 

JSTests/wasm/stress/cc-parameters-overwhelming-to-js.js

@@ -0,0 +1,62 @@
+import { instantiate } from "../wabt-wrapper.js"
+import * as assert from "../assert.js"
+
+let wat = `
+(module
+    (type $sig_test (func (param i32) (result i32)))
+
+    (import "o" "callee" (func $callee
+        (param $a i32) (param $b i32) (param $c i32) (param $d i32) (param $e i32) (param $f i32) (param $g i32) (param $h i32) (param $i i32) (param $j i32) (param $k i32) (param $l i32) (param $m i32) (param $n i32) (param $o i32) (param $p i32)
+        (result i32))
+    )
+
+    (func $test (export "test") (param $x i32) (result i32)
+        (i32.const 0)
+        (i32.const 1)
+        (i32.const 2)
+        (i32.const 3)
+        (i32.const 4)
+        (i32.const 5)
+        (i32.const 6)
+        (i32.const 7)
+        (i32.const 8)
+        (i32.const 9)
+        (i32.const 10)
+        (i32.const 11)
+        (i32.const 12)
+        (i32.const 13)
+        (i32.const 14)
+        (i32.const 15)
+        (call $callee)
+    )
+)
+`
+
+function callee(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) {
+    assert.eq(a, 0);
+    assert.eq(b, 1);
+    assert.eq(c, 2);
+    assert.eq(d, 3);
+    assert.eq(e, 4);
+    assert.eq(f, 5);
+    assert.eq(g, 6);
+    assert.eq(h, 7);
+    assert.eq(i, 8);
+    assert.eq(j, 9);
+    assert.eq(k, 10);
+    assert.eq(l, 11);
+    assert.eq(m, 12);
+    assert.eq(n, 13);
+    assert.eq(o, 14);
+    assert.eq(p, 15);
+    return 42;
+}
+
+async function test() {
+    const instance = await instantiate(wat, { o: { callee } })
+    const { test } = instance.exports
+
+    assert.eq(test(5), 42)
+}
+
+await assert.asyncTest(test())

LayoutTests/TestExpectations

@@ -1699,7 +1699,6 @@ imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/gap/masonry-gap-0
 webkit.org/b/266091 imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002.html [ ImageOnlyFailure ]
 
 webkit.org/b/266091 imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-001.html [ ImageOnlyFailure ]
-webkit.org/b/266091 imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-002.html [ ImageOnlyFailure ]
 webkit.org/b/266091 imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-003.html [ ImageOnlyFailure ]
 webkit.org/b/266091 imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-004.html [ ImageOnlyFailure ]
 webkit.org/b/266091 imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/intrinsic-sizing/masonry-intrinsic-sizing-cols-005.html [ ImageOnlyFailure ]
@@ -3068,6 +3067,7 @@ imported/w3c/web-platform-tests/css/css-text/tab-size/tab-size-block-ancestor.ht
 imported/w3c/web-platform-tests/css/css-text/tab-size/tab-size-integer-004.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-text/tab-size/tab-size-spacing-002.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-text/tab-size/tab-size-spacing-003.html [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/css/css-text/text-autospace/text-autospace-001.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-text/text-autospace/text-autospace-dynamic-001.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-text/text-autospace/text-autospace-no-001.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-text/text-autospace/text-autospace-ligature-001.html [ Pass Failure ]
@@ -7508,7 +7508,6 @@ imported/w3c/web-platform-tests/navigation-api/navigate-event/navigate-form-requ
 imported/w3c/web-platform-tests/navigation-api/navigate-event/cross-window/ [ Skip ]
 
 # These failures include UUIDs that change every run.
-imported/w3c/web-platform-tests/navigation-api/navigation-history-entry/key-id-back-same-document.html [ Failure ]
 imported/w3c/web-platform-tests/navigation-api/navigation-history-entry/key-id-location-reload.html [ Failure ]
 imported/w3c/web-platform-tests/navigation-api/navigation-history-entry/key-id-location-replace-cross-origin.html [ Failure ]
 imported/w3c/web-platform-tests/navigation-api/navigation-methods/navigate-replace-same-document.html [ Failure ]

LayoutTests/accessibility/display-contents/table-section-elements-expected.txt

@@ -0,0 +1,49 @@
+This test ensures the acessibility tree is correct when table section elements (e.g. thead, tbody) have display:contents.
+
+PASS: table.rowCount === 3 === true
+PASS: table.columnCount === 2 === true
+PASS: table.cellForColumnAndRow(0, 0).domIdentifier === 'r0c0'
+PASS: table.cellForColumnAndRow(1, 0).domIdentifier === 'r0c1'
+PASS: table.cellForColumnAndRow(0, 1).domIdentifier === 'r1c0'
+PASS: table.cellForColumnAndRow(1, 1).domIdentifier === 'r1c1'
+PASS: table.cellForColumnAndRow(0, 2).domIdentifier === 'r2c0'
+PASS: table.cellForColumnAndRow(1, 2).domIdentifier === 'r2c1'
+
+{#table AXRole: AXTable}
+
+{#r0-t0 AXRole: AXRow}
+
+{#r0c0 AXRole: AXCell}
+
+{AXRole: AXStaticText AXValue: Author}
+
+{#r0c1 AXRole: AXCell}
+
+{AXRole: AXStaticText AXValue: Title}
+
+{#r1 AXRole: AXRow}
+
+{#r1c0 AXRole: AXCell}
+
+{AXRole: AXStaticText AXValue: Stephen Hawking}
+
+{#r1c1 AXRole: AXCell}
+
+{AXRole: AXStaticText AXValue: A Brief History of Time}
+
+{#r2 AXRole: AXRow}
+
+{#r2c0 AXRole: AXCell}
+
+{AXRole: AXStaticText AXValue: Carl Sagan}
+
+{#r2c1 AXRole: AXCell}
+
+{AXRole: AXStaticText AXValue: Cosmos}
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Author	Title
+Stephen Hawking	A Brief History of Time
+Carl Sagan	Cosmos

LayoutTests/accessibility/display-contents/table-section-elements.html

@@ -0,0 +1,61 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/accessibility-helper.js"></script>
+<script src="../../resources/js-test.js"></script>
+<style>
+thead, tbody { display: contents; }
+</style>
+</head>
+<body>
+
+<table id="table">
+<thead id="thead">
+    <tr id="r0-t0">
+        <th id="r0c0">Author</th>
+        <th id="r0c1">Title</th>
+    </tr>
+</thead>
+<tbody id="tbody">
+    <tr id="r1">
+        <td id="r1c0">Stephen Hawking</td>
+        <td id="r1c1">A Brief History of Time</td>
+    </tr>
+    <tr id="r2">
+        <td id="r2c0">Carl Sagan</td>
+        <td id="r2c1">Cosmos</td>
+    </tr>
+</tbody>
+</table>
+
+<script>
+var output = "This test ensures the acessibility tree is correct when table section elements (e.g. thead, tbody) have display:contents.\n\n";
+
+if (window.accessibilityController) {
+    var table = accessibilityController.accessibleElementById("table");
+    const platform = accessibilityController.platformName;
+    if (platform !== "ios") {
+        // Don't do this on iOS because accessibilityController.accessibleElementById("table") doesn't return anything on iOS.
+        output += expect("table.rowCount === 3", "true");
+        output += expect("table.columnCount === 2", "true");
+
+        // Ensure we return the correct thing via the cellForColumnAndRow API, which ATs like VoiceOver use.
+        output += expect("table.cellForColumnAndRow(0, 0).domIdentifier", "'r0c0'");
+        output += expect("table.cellForColumnAndRow(1, 0).domIdentifier", "'r0c1'");
+
+        output += expect("table.cellForColumnAndRow(0, 1).domIdentifier", "'r1c0'");
+        output += expect("table.cellForColumnAndRow(1, 1).domIdentifier", "'r1c1'");
+
+        output += expect("table.cellForColumnAndRow(0, 2).domIdentifier", "'r2c0'");
+        output += expect("table.cellForColumnAndRow(1, 2).domIdentifier", "'r2c1'");
+    }
+
+    if (platform !== "atspi")
+        output += dumpAXSearchTraversal(accessibilityController.rootElement.childAtIndex(0));
+
+    debug(output);
+}
+</script>
+</body>
+</html>
+

LayoutTests/accessibility/dynamic-aria-describedby-text-expected.txt

@@ -0,0 +1,11 @@
+This test ensures that an element with aria-describedby when the text of the target changes.
+
+PASS: button.customContent.includes('New text') === false
+PASS: button.customContent.includes('New text') === true
+PASS: button.customContent.includes('Final text') === true
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Foo
+Final text