Upgrade to upstream WebKit 0e86b49069a5

CMakePresets.json

@@ -295,6 +295,10 @@
                 "CMAKE_IOS_SIMULATOR": {
                     "type": "BOOL",
                     "value": "ON"
+                },
+                "CMAKE_MAKE_PROGRAM": {
+                    "type": "FILEPATH",
+                    "value": "${sourceDir}/Source/cmake/ninja-wrapper"
                 }
             },
             "environment": {

Configurations/CommonBase.xcconfig

@@ -59,15 +59,15 @@ WK_GCC_PREPROCESSOR_DEFINITIONS = $(WK_GCC_PREPROCESSOR_DEFINITIONS_$(USE_INTERN
 WK_GCC_PREPROCESSOR_DEFINITIONS_YES = $(WK_OS_UNFAIR_LOCK_INLINE_CFLAGS) __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0;
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(WK_GCC_PREPROCESSOR_DEFINITIONS);
 
-WK_COMMON_OTHER_CFLAGS = $(WK_SANITIZER_OTHER_CFLAGS) $(WK_COMMON_OTHER_CFLAGS_PGO_$(WK_OR_$(WK_ENABLE_PGO_USE)_$(ENABLE_LLVM_PROFILE_GENERATION)));
+WK_COMMON_OTHER_CFLAGS = $(WK_AVAILABILITY_OVERLAY_FLAGS) $(WK_SANITIZER_OTHER_CFLAGS) $(WK_COMMON_OTHER_CFLAGS_PGO_$(WK_OR_$(WK_ENABLE_PGO_USE)_$(ENABLE_LLVM_PROFILE_GENERATION)));
 // Work around rdar://141760829 until the fix is available on all clang-1700
 // based toolchains.
 // Fix from rdar://178983382 to avoid symbol module prefix differences causing performance loss.
 WK_COMMON_OTHER_CFLAGS_PGO_YES = -mllvm -system-headers-coverage -mllvm -static-func-full-module-prefix=false;
 
 OTHER_CFLAGS = $(inherited) $(WK_COMMON_OTHER_CFLAGS);
 
-WK_COMMON_OTHER_CPLUSPLUSFLAGS = $(WK_LIBCPP_ASSERTIONS_CFLAGS);
+WK_COMMON_OTHER_CPLUSPLUSFLAGS = $(WK_AVAILABILITY_OVERLAY_FLAGS) $(WK_LIBCPP_ASSERTIONS_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(inherited) $(WK_COMMON_OTHER_CPLUSPLUSFLAGS);
 
 _EXPERIMENTAL_SWIFT_EXPLICIT_MODULES = YES;
@@ -83,10 +83,10 @@ WK_COMMON_OTHER_LDFLAGS = $(WK_SANITIZER_OTHER_LDFLAGS) $(WK_COMMON_OTHER_LDFLAG
 WK_COMMON_OTHER_LDFLAGS_INSTRUMENTATION_YES = -Wl,-rename_section,__DATA,__llvm_prf_cnts,__MMAP_DATA,__llvm_prf_cnts;
 OTHER_LDFLAGS = $(inherited) $(WK_COMMON_OTHER_LDFLAGS);
 
-WK_COMMON_OTHER_TAPI_FLAGS = -x objective-c++ -std=c++2b -fno-rtti $(WK_SANITIZER_OTHER_TAPI_FLAGS);
+WK_COMMON_OTHER_TAPI_FLAGS = -x objective-c++ -std=c++2b -fno-rtti $(WK_SANITIZER_OTHER_TAPI_FLAGS) $(WK_AVAILABILITY_OVERLAY_FLAGS);
 OTHER_TAPI_FLAGS = $(inherited) $(WK_COMMON_OTHER_TAPI_FLAGS);
 
-WK_DEFAULT_WK_AUDIT_SPI[sdk=iphoneos*] = $(WK_AND_$(WK_NOT_$(WK_ANY_SANITIZER_ENABLED))_$(OVERRIDE_SUPPORTS_TEXT_BASED_API:default=YES));
+WK_DEFAULT_WK_AUDIT_SPI[sdk=iphoneos*] = $(WK_AND_$(WK_NOT_$(WK_ANY_SANITIZER_ENABLED))_$(SUPPORTS_TEXT_BASED_API));
 // Explicitly disable auditing on other embedded platforms, because some SDKs
 // fall back to reading settings for iOS.
 WK_DEFAULT_WK_AUDIT_SPI[sdk=appletvos*] = ;
@@ -130,7 +130,7 @@ WK_SWIFT_CLANG_DEPLOYMENT_TARGET = $(WK_SWIFT_CLANG_DEPLOYMENT_TARGET_$(WK_PLATF
 WK_SWIFT_CLANG_DEPLOYMENT_TARGET_macosx = -clang-target $(CURRENT_ARCH)-apple-macos$(MACOSX_DEPLOYMENT_TARGET);
 
 // rdar://170129992: remove -track-system-dependencies when resolved
-OTHER_SWIFT_FLAGS = $(inherited) -Xcc -fvisibility=hidden -Werror ExistentialAny -Werror NoUseUnstructuredThrowingTask -Werror NoUsage -enable-upcoming-feature ExistentialAny $(WK_SWIFT_MEMORY_SAFETY_FLAGS) $(WK_SWIFT_MEMORY_SAFETY_ERROR_FLAGS) $(WK_SWIFT_CLANG_DEPLOYMENT_TARGET) $(WK_SANITIZER_OTHER_SWIFT_FLAGS) -enable-upcoming-feature InternalImportsByDefault -enable-upcoming-feature MemberImportVisibility -track-system-dependencies -enable-experimental-feature ImportCxxMembersLazily;
+OTHER_SWIFT_FLAGS = $(inherited) $(WK_AVAILABILITY_OVERLAY_SWIFT_FLAGS) -Xcc -fvisibility=hidden -Werror ExistentialAny -Werror NoUseUnstructuredThrowingTask -Werror NoUsage -enable-upcoming-feature ExistentialAny $(WK_SWIFT_MEMORY_SAFETY_FLAGS) $(WK_SWIFT_MEMORY_SAFETY_ERROR_FLAGS) $(WK_SWIFT_CLANG_DEPLOYMENT_TARGET) $(WK_SANITIZER_OTHER_SWIFT_FLAGS) -enable-upcoming-feature InternalImportsByDefault -enable-upcoming-feature MemberImportVisibility -track-system-dependencies -enable-experimental-feature ImportCxxMembersLazily;
 // Work around rdar://157581667 on affected toolchains.
 OTHER_SWIFT_FLAGS[sdk=*26.2*] = $(inherited) -Xcc -fno-modulemap-allow-subdirectory-search;
 OTHER_SWIFT_FLAGS[sdk=*26.3*] = $(inherited) -Xcc -fno-modulemap-allow-subdirectory-search;

Configurations/SDKAdditions.xcconfig

@@ -40,3 +40,14 @@ WK_PRIVATE_SDK_DIR = $(WK_PRIVATE_SDK_DIR_$(USE_INTERNAL_SDK));
 WK_PRIVATE_SDK_DIR_ = $(SDK_DIR_WebKitSDKAdditions_$(PLATFORM_NAME));
 WK_PRIVATE_SDK_DIR_[sdk=macos*] = $(SDK_DIR);
 WK_PRIVATE_SDK_DIR_YES = $(SDK_DIR);
+
+// Clang VFS overlay that replaces the SDK's <os/availability.h> and
+// <Availability.h> with WebKit-supplied stubs that defuse availability
+// checks.
+WK_AVAILABILITY_OVERLAY_YAML = $(BUILD_DIR)/availability-overlay.yaml;
+
+WK_AVAILABILITY_OVERLAY_FLAGS = -ivfsoverlay $(WK_AVAILABILITY_OVERLAY_YAML);
+WK_AVAILABILITY_OVERLAY_FLAGS[sdk=*.internal] = ;
+
+WK_AVAILABILITY_OVERLAY_SWIFT_FLAGS = -vfsoverlay $(WK_AVAILABILITY_OVERLAY_YAML);
+WK_AVAILABILITY_OVERLAY_SWIFT_FLAGS[sdk=*.internal] = ;

Configurations/Version.xcconfig

@@ -21,9 +21,9 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
-MAJOR_VERSION = 625;
+MAJOR_VERSION = 626;
 MINOR_VERSION = 1;
-TINY_VERSION = 24;
+TINY_VERSION = 1;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);

JSTests/microbenchmarks/async-function-return-number-no-await.js

@@ -0,0 +1,25 @@
+// Async functions without await returning a primitive should fulfill the result
+// promise inline; proving non-thenable-ness in constant folding also removes the
+// world clobber around the promise allocation.
+
+async function compute(x) {
+    return x * 2 + 1;
+}
+
+function kernel(count) {
+    let last;
+    for (let i = 0; i < count; i++)
+        last = compute(i);
+    return last;
+}
+noInline(kernel);
+
+let last;
+for (let r = 0; r < 5; r++)
+    last = kernel(2e6);
+
+last.then((value) => {
+    if (value !== (2e6 - 1) * 2 + 1)
+        throw new Error("bad result");
+});
+drainMicrotasks();

JSTests/microbenchmarks/async-function-return-object-no-await.js

@@ -0,0 +1,29 @@
+// Async functions without await returning an object literal should fulfill the
+// result promise inline once constant folding proves the resolved value is not
+// a thenable, instead of calling operationNewResolvedPromise every time.
+
+const rows = [];
+for (let j = 0; j < 16; j++)
+    rows.push({ id: j, first: 'A' + j, last: 'B' + j, score: j * 3 });
+
+async function toDTO(row) {
+    return { id: row.id, name: row.first, score: row.score, ok: true };
+}
+
+function kernel(count) {
+    let last;
+    for (let i = 0; i < count; i++)
+        last = toDTO(rows[i & 15]);
+    return last;
+}
+noInline(kernel);
+
+let last;
+for (let r = 0; r < 5; r++)
+    last = kernel(8e5);
+
+last.then((dto) => {
+    if (dto.score !== rows[(8e5 - 1) & 15].score)
+        throw new Error("bad result");
+});
+drainMicrotasks();

JSTests/microbenchmarks/await-async-function-call-chain.js

@@ -0,0 +1,18 @@
+// Awaiting a chain of distinct async functions makes each microtask resume a
+// different function, stressing the microtask call cache in the drain loop.
+
+async function d5() { return 42; }
+async function d4() { return await d5(); }
+async function d3() { return await d4(); }
+async function d2() { return await d3(); }
+async function d1() { return await d2(); }
+
+async function run() {
+    let acc = 0;
+    for (let i = 0; i < 1e5; i++)
+        acc += await d1();
+    return acc;
+}
+
+run();
+drainMicrotasks();

JSTests/microbenchmarks/concat-multiarg-int32-three.js

@@ -0,0 +1,22 @@
+var as = [];
+for (var a = 0; a < 8; a++) {
+    var h = [];
+    for (var j = 0; j < 8; j++)
+        h.push(a * 100 + j);
+    as.push(h);
+}
+var b = [];
+for (var j = 0; j < 16; j++)
+    b.push(j);
+var c = [];
+for (var j = 0; j < 4; j++)
+    c.push(j);
+
+var result = 0;
+for (var i = 0; i < 2e6; i++) {
+    var r = [].concat(as[i & 7], b, c);
+    result += r.length;
+}
+
+if (result !== 56e6)
+    throw new Error("bad result: " + result);

JSTests/microbenchmarks/concat-multiarg-receiver.js

@@ -0,0 +1,18 @@
+var base = [];
+for (var j = 0; j < 8; j++)
+    base.push({ name: 'base' + j });
+var user = [];
+for (var j = 0; j < 8; j++)
+    user.push({ name: 'user' + j });
+var extra = [];
+for (var j = 0; j < 2; j++)
+    extra.push({ name: 'extra' + j });
+
+var result = 0;
+for (var i = 0; i < 2e6; i++) {
+    var r = base.concat(user, extra);
+    result += r.length;
+}
+
+if (result !== 36e6)
+    throw new Error("bad result: " + result);

JSTests/microbenchmarks/concat-multiarg-scalar.js

@@ -0,0 +1,13 @@
+var a = [1, 2, 3, 4, 5, 6, 7, 8];
+var b = [10, 20, 30, 40];
+
+var result = 0;
+for (var i = 0; i < 2e6; i++) {
+    var r = a.concat(i & 7, 9);
+    result += r.length;
+    r = a.concat(b, i & 7);
+    result += r.length;
+}
+
+if (result !== 46e6)
+    throw new Error("bad result: " + result);

JSTests/microbenchmarks/concat-multiarg-strings.js

@@ -0,0 +1,19 @@
+var heads = [];
+for (var a = 0; a < 8; a++) {
+    var h = [];
+    for (var j = 0; j < 8; j++)
+        h.push('h' + a + '_' + j);
+    heads.push(h);
+}
+var mid = [];
+for (var j = 0; j < 8; j++)
+    mid.push('m' + j);
+
+var result = 0;
+for (var i = 0; i < 2e6; i++) {
+    var r = [].concat(heads[i & 7], mid);
+    result += r.length;
+}
+
+if (result !== 32e6)
+    throw new Error("bad result: " + result);

JSTests/microbenchmarks/encode-uri-component-query-string.js

@@ -0,0 +1,18 @@
+// Tests encodeURIComponent on query-string payloads full of spaces, quotes,
+// ampersands and percent signs, mimicking building fetch URLs from JSON values.
+
+const values = [];
+for (let j = 0; j < 16; j++)
+    values.push('user query ' + j + ': {"name":"Alice & Bob","tags":["a b","c=d"],"note":"100% legit, really?","page":' + j + '}');
+
+let expected = 0;
+for (let j = 0; j < 16; j++)
+    expected += encodeURIComponent(values[j]).length;
+
+const iterations = 200000;
+let sum = 0;
+for (let i = 0; i < iterations; i++)
+    sum += encodeURIComponent(values[i & 15]).length;
+
+if (sum !== expected * (iterations / 16))
+    throw new Error("bad result: " + sum);

JSTests/microbenchmarks/encode-uri-component-unicode.js

@@ -0,0 +1,18 @@
+// Tests encodeURIComponent on non-ASCII text where every character expands to
+// multiple %XY escape sequences.
+
+const values = [];
+for (let j = 0; j < 16; j++)
+    values.push('検索クエリ' + j + ': 東京都渋谷区の天気予報と交通情報を教えてください \u{1F600}\u{1F680}');
+
+let expected = 0;
+for (let j = 0; j < 16; j++)
+    expected += encodeURIComponent(values[j]).length;
+
+const iterations = 100000;
+let sum = 0;
+for (let i = 0; i < iterations; i++)
+    sum += encodeURIComponent(values[i & 15]).length;
+
+if (sum !== expected * (iterations / 16))
+    throw new Error("bad result: " + sum);

JSTests/microbenchmarks/has-own-property-call-for-in-loop.js

@@ -0,0 +1,33 @@
+function assert(b) {
+    if (!b)
+        throw new Error;
+}
+
+function test1() {
+    function count(o) {
+        let c = 0;
+        for (let p in o) {
+            if (Object.prototype.hasOwnProperty.call(o, p))
+                c += p.length;
+        }
+        return c;
+    }
+    noInline(count);
+
+    const keys = ['method', 'url', 'status', 'headers', 'body', 'retries', 'timeout', 'ok'];
+    let srcs = [];
+    for (let j = 0; j < 16; j++) {
+        let o = {};
+        for (let k of keys)
+            o[k] = k + j;
+        srcs.push(o);
+    }
+
+    let expected = 0;
+    for (let k of keys)
+        expected += k.length;
+
+    for (let i = 0; i < 1000000; ++i)
+        assert(count(srcs[i & 15]) === expected);
+}
+test1();

JSTests/microbenchmarks/intl-number-format-unit-to-parts.js

@@ -1,4 +1,3 @@
-//@ skip if ["WPE", "GTK"].include?($platform)
 // This benchmark tests NumberFormat with unit style which creates {type, value, unit} objects
 // The pre-built Structure with unit property optimization should show improvement here
 function test() {

JSTests/microbenchmarks/join-template-literal-parts.js

@@ -0,0 +1,19 @@
+var keys = ['utm_source', 'utm_medium', 'campaign_id', 'session_token', 'user_locale', 'page_number', 'sort_order', 'filter_state'];
+var vals = [];
+for (var j = 0; j < 16; ++j)
+    vals.push('value_' + (j * 7919) + '_abcdefgh');
+
+function build(i) {
+    var parts = [];
+    for (var j = 0; j < 8; ++j)
+        parts.push(`${keys[j]}=${vals[(i + j) & 15]}`);
+    return parts.join('&');
+}
+noInline(build);
+
+var sum = 0;
+for (var i = 0; i < 200000; ++i)
+    sum += build(i).length;
+
+if (sum !== 52400000)
+    throw new Error("bad sum: " + sum);

JSTests/microbenchmarks/json-parse-int32-array.js

@@ -0,0 +1,26 @@
+// Parsing JSON payloads dominated by int32 numbers, e.g. time series metrics or tilemap data.
+
+var payloads = [];
+var arrays = [];
+for (var k = 0; k < 16; k++) {
+    var pts = [];
+    for (var j = 0; j < 1024; j++)
+        pts.push(((j * 2654435761 + k * 97) >>> 0) % 100000);
+    arrays.push(pts);
+    payloads.push(JSON.stringify({ series: "cpu", points: pts }));
+}
+
+var iterations = 30000;
+
+var expected = 0;
+for (var i = 0; i < iterations; i++)
+    expected += 1024 + arrays[i & 15][i & 1023];
+
+var sum = 0;
+for (var i = 0; i < iterations; i++) {
+    var o = JSON.parse(payloads[i & 15]);
+    sum += o.points.length + o.points[i & 1023];
+}
+
+if (sum !== expected)
+    throw new Error("bad result: " + sum + " vs " + expected);