Upgrade to upstream WebKit 24362e675175

.gitignore

@@ -11,6 +11,7 @@
 autoinstall.cache.d
 project.xcworkspace
 xcuserdata
+*.xcresult
 DerivedData
 .mailmap
 results
@@ -96,4 +97,6 @@ CLAUDE.md
 
 # Ignore tracing files
 *.atrc
+*.profraw
+*.pas_stats.jsonl
 

CMakeLists.txt

@@ -7,42 +7,16 @@
 # and loading the cross-compilation settings from CMAKE_TOOLCHAIN_FILE.
 
 cmake_minimum_required(VERSION 3.20)
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
+
+if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+    # Resolve the SDK and pin tools before the call to project().
+    include(WebKitXcodeSDK)
+endif ()
 
 if (PORT STREQUAL "IOS")
+    # FIXME: Delete or merge into WebKitXcodeSDK logic.
     set(CMAKE_SYSTEM_NAME iOS)
-    if (CMAKE_IOS_SIMULATOR)
-        set(_sdk_name "iphonesimulator.internal")
-        set(_sdk_name_fallback "iphonesimulator")
-    else ()
-        set(_sdk_name "iphoneos.internal")
-        set(_sdk_name_fallback "iphoneos")
-    endif ()
-    execute_process(COMMAND xcrun --sdk ${_sdk_name} --show-sdk-path
-        OUTPUT_VARIABLE _ios_sysroot
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        RESULT_VARIABLE _internal_sdk_result
-        ERROR_QUIET)
-    if (NOT _internal_sdk_result EQUAL 0 OR NOT _ios_sysroot)
-        set(_ios_sysroot "")
-        if (CMAKE_OSX_SYSROOT AND EXISTS "${CMAKE_OSX_SYSROOT}")
-            set(_ios_sysroot "${CMAKE_OSX_SYSROOT}")
-        elseif (DEFINED ENV{SDKROOT} AND EXISTS "$ENV{SDKROOT}" AND "$ENV{SDKROOT}" MATCHES "iPhone")
-            set(_ios_sysroot "$ENV{SDKROOT}")
-        else ()
-            execute_process(COMMAND xcrun --sdk ${_sdk_name_fallback} --show-sdk-path
-                OUTPUT_VARIABLE _ios_sysroot
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-                ERROR_QUIET)
-        endif ()
-    endif ()
-    if (_ios_sysroot)
-        set(CMAKE_OSX_SYSROOT "${_ios_sysroot}" CACHE PATH "iOS SDK path" FORCE)
-    endif ()
-    unset(_sdk_name)
-    unset(_sdk_name_fallback)
-    unset(_internal_sdk_result)
-    unset(_ios_sysroot)
-
     if (NOT CMAKE_OSX_ARCHITECTURES)
         if (CMAKE_OSX_SYSROOT MATCHES "\\.Internal\\.sdk$" AND NOT CMAKE_OSX_SYSROOT MATCHES "[Ss]imulator")
             execute_process(COMMAND uname -m
@@ -66,32 +40,11 @@ if (PORT STREQUAL "IOS")
     endif ()
 endif ()
 
-if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND NOT CMAKE_SYSTEM_NAME STREQUAL "iOS" AND NOT CMAKE_OSX_SYSROOT)
-    # Set CMAKE_OSX_SYSROOT before the project() call below. project() runs ABI
-    # detection tests whose results are cached; having the wrong sysroot there
-    # would cause those cached results to refer to a different SDK than actual
-    # builds use. OptionsMac.cmake (which sets this via WEBKIT_XCRUN) is loaded
-    # only after project() via include(WebKitCommon), so it is too late.
-    # WEBKIT_XCRUN is also unavailable here because WebKitXcrun.cmake is
-    # included by OptionsMac.cmake.
-    execute_process(COMMAND xcrun --sdk macosx --show-sdk-path
-        OUTPUT_VARIABLE _macos_sysroot
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        RESULT_VARIABLE _xcrun_result
-        ERROR_QUIET)
-    if (_xcrun_result EQUAL 0 AND _macos_sysroot)
-        set(CMAKE_OSX_SYSROOT "${_macos_sysroot}" CACHE PATH "macOS SDK path" FORCE)
-    endif ()
-    unset(_macos_sysroot)
-    unset(_xcrun_result)
-endif ()
-
 project(WebKit LANGUAGES C CXX)
 
 # -----------------------------------------------------------------------------
 # Common configuration
 #------------------------------------------------------------------------------
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
 include(WebKitCommon)
 
 # -----------------------------------------------------------------------------
@@ -160,6 +113,8 @@ if (DEVELOPER_MODE)
     endif ()
 endif ()
 
+WEBKIT_GENERATE_HEADER_MAPS()
+
 # -----------------------------------------------------------------------------
 # Print the features list last, for maximum visibility.
 # -----------------------------------------------------------------------------

Configurations/CommonBase.xcconfig

@@ -129,7 +129,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 -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) -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/Version.xcconfig

@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 625;
 MINOR_VERSION = 1;
-TINY_VERSION = 19;
+TINY_VERSION = 21;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);

JSTests/microbenchmarks/class-fields-anonymous-arrow-function-fields.js

@@ -0,0 +1,28 @@
+// Stresses SetFunctionName for anonymous arrow function class fields.
+class ArrowFunctionFields {
+    render = (...args) => args;
+    setLayout = (l) => l;
+    getLayout = () => 0;
+    setRenderer = (r) => r;
+    header = (n, v) => v;
+    status = (s) => s;
+    set = (k, v) => v;
+    get = (k) => k;
+    newResponse = (...a) => a;
+    body = (d) => d;
+    text = (t) => t;
+    json = (o) => o;
+    html = (h) => h;
+    redirect = (l) => l;
+    notFound = () => null;
+}
+
+function bench(testClass) {
+    var instance;
+    for (var i = 0; i < 1e5; i++)
+        instance = new testClass();
+    return instance;
+}
+noInline(bench);
+
+bench(ArrowFunctionFields);

JSTests/microbenchmarks/regexp-empty-body-parens.js

@@ -0,0 +1,58 @@
+//@ skip if $model == "Apple Watch Series 3" # added by mark-jsc-stress-test.py
+// This benchmarks quantified parentheses whose body can match an empty
+// string, e.g. /(){3}/, /(?:){5}/, /(a?){3}/. The Yarr JIT compiles these
+// patterns and then bails to the interpreter at runtime via the
+// empty-match-detection branch in ParenthesesSubpattern[FixedCount]End.
+// This microbenchmark guards against regressions in either the JIT
+// compilation path or the interpreter fallback for the empty-body case.
+
+(function() {
+    var result = 0;
+    var n = 200000;
+
+    var str1 = "abc";
+    var str2 = "";
+    var str3 = "aaa";
+    var str4 = "aaab";
+    var str5 = "xx";
+
+    // Pure empty body — JIT bails to interpreter on the first iteration.
+    var re1 = /(){3}/;             // capturing empty
+    var re2 = /(?:){3}/;           // non-capturing empty
+    var re3 = /((?:)){3}/;         // capturing of empty alternative
+
+    // Optional / alternation that matches empty for some inputs.
+    var re4 = /(a?){3}/;           // optional content
+    var re5 = /(|x){3}/;           // empty alternation
+    var re6 = /(x|){3}/;           // empty alternation
+
+    // Empty inner inside a non-empty outer.
+    var re7 = /(a()){3}/;          // outer non-empty, inner empty
+
+    // Empty paren followed by capturing content.
+    var re8 = /(){2}(a)b/;
+
+    for (var i = 0; i < n; ++i) {
+        if (re1.exec(str1))
+            ++result;
+        if (re2.exec(str1))
+            ++result;
+        if (re3.exec(str1))
+            ++result;
+        if (re4.exec(str2))
+            ++result;
+        if (re4.exec(str3))
+            ++result;
+        if (re5.exec(str2))
+            ++result;
+        if (re6.exec(str5))
+            ++result;
+        if (re7.exec(str4))
+            ++result;
+        if (re8.exec("ab"))
+            ++result;
+    }
+
+    if (result != n * 9)
+        throw "Error: bad result: " + result;
+})();

JSTests/microbenchmarks/regexp-fixed-count-capturing-parens.js

@@ -0,0 +1,44 @@
+//@ skip if $model == "Apple Watch Series 3" # added by mark-jsc-stress-test.py
+// This benchmarks capturing parentheses with fixed-count quantifiers whose
+// body has a single alternative and contains nothing backtrackable, e.g.
+// /([0-9a-fA-F]){12}/ or /([0-9a-fA-F]{4}\.){2}/. These now route to the
+// ParenthesesSubpatternFixedCount fast path that no longer allocates a
+// ParenContext per iteration.
+
+(function() {
+    var result = 0;
+    var n = 500000;
+
+    // Test strings that will match
+    var str1 = "0123456789ab";        // for ([0-9a-fA-F]){12}
+    var str2 = "abcd.efff.0011";      // for ([0-9a-fA-F]{4}\.){2}([0-9a-fA-F]{4})
+    var str3 = "aaa";                 // for ([a-z]){3}
+    var str4 = "abcabc";              // for ([a-z]{3}){2}
+
+    // Test strings that will fail (exercise the abort/backtrack path).
+    var fail1 = "0123456789ax";
+    var fail2 = "abcd.efgh.0011";
+
+    var re1 = /([0-9a-fA-F]){12}/;
+    var re2 = /([0-9a-fA-F]{4}\.){2}([0-9a-fA-F]{4})/;
+    var re3 = /([a-z]){3}/;
+    var re4 = /([a-z]{3}){2}/;
+
+    for (var i = 0; i < n; ++i) {
+        if (re1.exec(str1))
+            ++result;
+        if (re2.exec(str2))
+            ++result;
+        if (re3.exec(str3))
+            ++result;
+        if (re4.exec(str4))
+            ++result;
+        if (re1.exec(fail1) === null)
+            ++result;
+        if (re2.exec(fail2) === null)
+            ++result;
+    }
+
+    if (result != n * 6)
+        throw "Error: bad result: " + result;
+})();

JSTests/microbenchmarks/regexp-prototype-match-anchor.js

@@ -0,0 +1,19 @@
+function shouldBe(actual, expected) {
+    if (JSON.stringify(actual) !== JSON.stringify(expected))
+        throw new Error(`Expected ${JSON.stringify(expected)} but got ${JSON.stringify(actual)}`);
+}
+
+const str = ("X".repeat(50) + "the_end").repeat(2);
+
+const re1 = /the_end$/;
+const re2 = /^X{50}the_end$/;
+const re3 = /the_end/g;
+
+for (let i = 0; i < 1e5; i++) {
+    shouldBe(re1[Symbol.match](str)[0], "the_end");
+    shouldBe(re2[Symbol.match](str), null);
+    shouldBe(re3[Symbol.match](str), ["the_end", "the_end"]);
+    shouldBe(str.match(re1)[0], "the_end");
+    shouldBe(str.match(re2), null);
+    shouldBe(str.match(re3), ["the_end", "the_end"]);
+}

JSTests/microbenchmarks/regexp-prototype-match-basic.js

@@ -0,0 +1,17 @@
+function shouldBe(a, b) {
+    if (JSON.stringify(a) !== JSON.stringify(b))
+        throw new Error(`Expected ${JSON.stringify(b)} but got ${JSON.stringify(a)}`);
+}
+
+const str = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzfoo";
+const re1 = /foo/;
+const re2 = /bar/;
+const re3 = /[a-z]/g;
+for (let i = 0; i < 1e4; i++) {
+    shouldBe(re1[Symbol.match](str)[0], "foo");
+    shouldBe(re2[Symbol.match](str), null);
+    shouldBe(re3[Symbol.match](str).length, 81);
+    shouldBe(str.match(re1)[0], "foo");
+    shouldBe(str.match(re2), null);
+    shouldBe(str.match(re3).length, 81);
+}

JSTests/microbenchmarks/regexp-prototype-match-complex-pattern.js

@@ -0,0 +1,19 @@
+function shouldBe(actual, expected) {
+    if (JSON.stringify(actual) !== JSON.stringify(expected))
+        throw new Error(`Expected ${JSON.stringify(expected)} but got ${JSON.stringify(actual)}`);
+}
+
+const str = "abc123XYZ_foo_bar_baz_987654321".repeat(2);
+
+const re1 = /abc\d+XYZ_foo_bar_baz_\d+/;
+const re2 = /abc\d+(?=XXX)(?:_foo_)(?:bar_)(?:baz_)\d+/;
+const re3 = /\d+/g;
+
+for (let i = 0; i < 1e4; i++) {
+    shouldBe(re1[Symbol.match](str)[0], "abc123XYZ_foo_bar_baz_987654321");
+    shouldBe(re2[Symbol.match](str), null);
+    shouldBe(re3[Symbol.match](str), ["123", "987654321", "123", "987654321"]);
+    shouldBe(str.match(re1)[0], "abc123XYZ_foo_bar_baz_987654321");
+    shouldBe(str.match(re2), null);
+    shouldBe(str.match(re3), ["123", "987654321", "123", "987654321"]);
+}

JSTests/microbenchmarks/regexp-prototype-match-no-strength-reduction.js

@@ -0,0 +1,9 @@
+function shouldBe(a, b) {
+    if (JSON.stringify(a) !== JSON.stringify(b))
+        throw new Error(`Expected ${JSON.stringify(b)} but got ${JSON.stringify(a)}`);
+}
+
+for (let i = 0; i < 1e5; i++) {
+    shouldBe(new RegExp("wor" + "ld")[Symbol.match]("hello world")[0], "world");
+    shouldBe(/hello/[Symbol.match]("hello" + "world" + Math.random())[0], "hello");
+}