Upgrade to WebKit 39d4ce1f12ea

.submitproject

@@ -1,20 +1,20 @@
 [submitproject "filter"]
     includedSubdirectoryPatterns = .sourcefilters
     includedSubdirectoryPatterns = Configurations/
-    includedSubdirectoryPatterns = Source/
-    includedSubdirectoryPatterns = WebKitLibraries/SDKs/*.internal-additions.sdk/
+    includedSubdirectoryPatterns = Source/bmalloc/
+    includedSubdirectoryPatterns = Source/JavaScriptCore/
+    includedSubdirectoryPatterns = Source/WebCore/
+    includedSubdirectoryPatterns = Source/WebDriver/
+    includedSubdirectoryPatterns = Source/WebGPU/
+    includedSubdirectoryPatterns = Source/WebInspectorUI/
+    includedSubdirectoryPatterns = Source/WebKit/
+    includedSubdirectoryPatterns = Source/WebKitLegacy/
+    includedSubdirectoryPatterns = Source/WTF/
+    includedSubdirectoryPatterns = Source/ThirdParty/ANGLE/
+    includedSubdirectoryPatterns = Source/ThirdParty/libwebrtc/
     excludedSubdirectoryPatterns = Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/util
     excludedSubdirectoryPatterns = Source/ThirdParty/libwebrtc/Source/webrtc/examples
-    excludedSubdirectoryPatterns = Source/ThirdParty/capstone
-    excludedSubdirectoryPatterns = Source/ThirdParty/d3flamegraphjs
-    excludedSubdirectoryPatterns = Source/ThirdParty/d3js
-    excludedSubdirectoryPatterns = Source/ThirdParty/gmock
-    excludedSubdirectoryPatterns = Source/ThirdParty/gtest
-    excludedSubdirectoryPatterns = Source/ThirdParty/libsysprof-capture
-    excludedSubdirectoryPatterns = Source/ThirdParty/qunit
-    excludedSubdirectoryPatterns = Source/ThirdParty/skia
-    excludedSubdirectoryPatterns = Source/ThirdParty/unifdef
-    excludedSubdirectoryPatterns = Source/ThirdParty/xdgmime
     excludedSubdirectoryPatterns = Source/*/SaferCPPExpectations/
+    includedSubdirectoryPatterns = WebKitLibraries/SDKs/*.internal-additions.sdk/
 [submitproject "gitmodules"]
     enabled = false

.submitproject-append

@@ -0,0 +1,9 @@
+[submitproject "filter"]
+    includedSubdirectoryPatterns = Source/ThirdParty/gmock
+    includedSubdirectoryPatterns = Source/ThirdParty/gtest
+    includedSubdirectoryPatterns = Tools/DumpRenderTree
+    includedSubdirectoryPatterns = Tools/ImageDiff
+    includedSubdirectoryPatterns = Tools/MiniBrowser
+    includedSubdirectoryPatterns = Tools/TestRunnerShared
+    includedSubdirectoryPatterns = Tools/WebKitTestRunner
+    excludedSubdirectoryPatterns = Tools/WebKitTestRunner/gtk

.wkdev-sdk-version

@@ -1 +1 @@
-2.53-v2-2352e15
+2.53-v5-3bdf4b8

CMakeLists.txt

@@ -61,6 +61,26 @@ 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)
 
 # -----------------------------------------------------------------------------
@@ -111,23 +131,24 @@ if (SWIFT_REQUIRED)
     endif ()
 
     # Override Swift compiler to a wrapper script to work around the
-    # fact pkg-config feeds CFLAGS even to swiftc.
-    # Guard against cache poisoning: if CMAKE_Swift_COMPILER already IS the
-    # wrapper (from a previous configure), find the real compiler via 'which'.
+    # fact CMake feeds incorrect flags to swiftc.
     set(_swift_wrapper "${CMAKE_SOURCE_DIR}/Tools/Scripts/swift/swiftc-wrapper.sh")
     if (CMAKE_Swift_COMPILER STREQUAL _swift_wrapper)
-        execute_process(COMMAND which swiftc RESULT_VARIABLE _which_retcode OUTPUT_VARIABLE _real_swiftc OUTPUT_STRIP_TRAILING_WHITESPACE)
-        if (NOT _which_retcode EQUAL 0)
-            message(FATAL_ERROR "swiftc not found in PATH")
+        if (NOT ORIGINAL_Swift_COMPILER)
+            find_program(ORIGINAL_Swift_COMPILER NAMES swiftc REQUIRED)
         endif ()
     else ()
-        set(_real_swiftc "${CMAKE_Swift_COMPILER}")
+        set(ORIGINAL_Swift_COMPILER "${CMAKE_Swift_COMPILER}" CACHE FILEPATH "Original Swift compiler" FORCE)
     endif ()
-    set(ORIGINAL_Swift_COMPILER "${_real_swiftc}" CACHE FILEPATH "Original Swift compiler" FORCE)
-    set(CMAKE_Swift_COMPILER "${_swift_wrapper}" CACHE FILEPATH "Swift compiler wrapper" FORCE)
+    set(CMAKE_Swift_COMPILER "${_swift_wrapper}")
     add_compile_options($<$<COMPILE_LANGUAGE:Swift>:--original-swift-compiler=${ORIGINAL_Swift_COMPILER}>)
+    add_link_options($<$<LINK_LANGUAGE:Swift>:--original-swift-compiler=${ORIGINAL_Swift_COMPILER}>)
+    # The static archive rule (<CMAKE_Swift_CREATE_STATIC_LIBRARY>) uses neither
+    # <FLAGS> nor link options, so inject the flag directly into the template.
+    string(REPLACE "<CMAKE_Swift_COMPILER>"
+        "<CMAKE_Swift_COMPILER> --original-swift-compiler=${ORIGINAL_Swift_COMPILER}"
+        CMAKE_Swift_CREATE_STATIC_LIBRARY "${CMAKE_Swift_CREATE_STATIC_LIBRARY}")
     unset(_swift_wrapper)
-    unset(_real_swiftc)
 endif ()
 
 # -----------------------------------------------------------------------------

CMakePresets.json

@@ -226,6 +226,10 @@
                     "type": "STRING",
                     "value": "thread"
                 },
+                "USE_SYSTEM_MALLOC": {
+                    "type": "BOOL",
+                    "value": "ON"
+                },
                 "ENABLE_EXPERIMENTAL_FEATURES": {
                     "type": "BOOL",
                     "value": "OFF"

Configurations/CommonBase.xcconfig

@@ -30,6 +30,7 @@
 
 WK_ENABLE_SLOW_BUILD_VERIFICATION = $(WK_ENABLE_SLOW_BUILD_VERIFICATION_$(CONFIGURATION));
 WK_ENABLE_SLOW_BUILD_VERIFICATION_Production = YES;
+__ALLOW_EXCLUDED_USER_SCRIPT_SANDBOXING_PHASE_NAMES = YES;
 
 // Prefix Definitions
 //
@@ -47,10 +48,15 @@ WK_GCC_OPTIMIZATION_LEVEL_SANITIZER_OVERRIDE_NO = $(WK_DEFAULT_GCC_OPTIMIZATION_
 WK_GCC_OPTIMIZATION_LEVEL_SANITIZER_OVERRIDE_YES = $(WK_SANITIZER_GCC_OPTIMIZATION_LEVEL);
 
 WK_OS_UNFAIR_LOCK_INLINE_CFLAGS = $(WK_OS_UNFAIR_LOCK_INLINE_CFLAGS_$(USE_INTERNAL_SDK));
-WK_OS_UNFAIR_LOCK_INLINE_CFLAGS_YES = OS_UNFAIR_LOCK_INLINE=1
+WK_OS_UNFAIR_LOCK_INLINE_CFLAGS_YES = OS_UNFAIR_LOCK_INLINE=1;
 
-WK_GCC_PREPROCESSOR_DEFINITIONS = $(WK_GCC_PREPROCESSOR_DEFINITIONS_$(USE_INTERNAL_SDK));
-WK_GCC_PREPROCESSOR_DEFINITIONS_YES = $(WK_OS_UNFAIR_LOCK_INLINE_CFLAGS) __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0
+WK_ENGINEERING_BUILD = $(WK_ENGINEERING_BUILD_$(CONFIGURATION));
+WK_ENGINEERING_BUILD_Debug = 1;
+WK_ENGINEERING_BUILD_Release = 1;
+WK_ENGINEERING_BUILD_Production = 0;
+
+WK_GCC_PREPROCESSOR_DEFINITIONS = $(WK_GCC_PREPROCESSOR_DEFINITIONS_$(USE_INTERNAL_SDK)) ENGINEERING_BUILD=$(WK_ENGINEERING_BUILD);
+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)));

Configurations/Version.xcconfig

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

Configurations/WebKitProjectPaths.xcconfig

@@ -80,6 +80,12 @@ UMBRELLA_FRAMEWORKS_DIR_OVERRIDE_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
 WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions;
 WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH[config=Production] = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions;
 
+WK_WEBKITADDITIONS_POSTPROCESS_SCRIPTS_INPUT = $(WK_WEBKITADDITIONS_POSTPROCESS_SCRIPTS_INPUT_$(USE_INTERNAL_SDK)_$(WK_IS_INSTALLHDRS));
+WK_WEBKITADDITIONS_POSTPROCESS_SCRIPTS_INPUT_YES_NO = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/Scripts/postprocess-framework-headers-definitions;
+
+WK_WEBKITADDITIONS_BRANCH_CONFIG_INPUT = $(WK_WEBKITADDITIONS_BRANCH_CONFIG_INPUT_$(USE_INTERNAL_SDK)_$(WK_IS_INSTALLHDRS));
+WK_WEBKITADDITIONS_BRANCH_CONFIG_INPUT_YES_NO = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/Scripts/branch_config.json;
+
 // The root directory of the workspace / WebKit repo is determined by how many directories up "Source" or "Tools" is from the SRCROOT.
 WK_WORKSPACE_DIR = $(WK_WORKSPACE_DIR_1_$(SRCROOT:dir:standardizepath:file):standardizepath:default=$(WK_WORKSPACE_DIR_2_$(SRCROOT:dir:standardizepath:dir:standardizepath:file):standardizepath:default=$(WK_WORKSPACE_DIR_3_$(SRCROOT:dir:standardizepath:dir:standardizepath:dir:standardizepath:file):standardizepath:default=$(WK_WORKSPACE_DIR_4_$(SRCROOT:dir:standardizepath:dir:standardizepath:dir:standardizepath:dir:standardizepath:file):standardizepath:default=$(WK_WORKSPACE_DIR_5_$(SRCROOT:dir:standardizepath:dir:standardizepath:dir:standardizepath:dir:standardizepath:dir:standardizepath:file):standardizepath:default=$(WK_WORKSPACE_DIR_6_$(SRCROOT:dir:standardizepath:dir:standardizepath:dir:standardizepath:dir:standardizepath:dir:standardizepath:dir:standardizepath:file):standardizepath))))));
 WK_WORKSPACE_DIR_1_Source = $(SRCROOT)/../..;

JSTests/microbenchmarks/array-includes-string-8bit-long.js

@@ -0,0 +1,23 @@
+function makeString(len, ch) {
+    let s = "";
+    for (let i = 0; i < len; ++i)
+        s += ch;
+    return s;
+}
+
+function test(arr, key) {
+    return arr.includes(key);
+}
+noInline(test);
+
+let arr = [];
+for (let i = 0; i < 64; ++i)
+    arr.push(String.fromCharCode(65 + (i % 26)) + makeString(63, "x"));
+
+let key = "@" + makeString(63, "x");
+let result = 0;
+for (let i = 0; i < 5e4; ++i)
+    result += test(arr, key) ? 1 : 0;
+
+if (result !== 0)
+    throw new Error("bad result: " + result);

JSTests/microbenchmarks/array-indexof-string-8bit-long.js

@@ -0,0 +1,23 @@
+function makeString(len, ch) {
+    let s = "";
+    for (let i = 0; i < len; ++i)
+        s += ch;
+    return s;
+}
+
+function test(arr, key) {
+    return arr.indexOf(key);
+}
+noInline(test);
+
+let arr = [];
+for (let i = 0; i < 64; ++i)
+    arr.push(String.fromCharCode(65 + (i % 26)) + makeString(63, "x"));
+
+let key = "@" + makeString(63, "x");
+let result = 0;
+for (let i = 0; i < 5e4; ++i)
+    result += test(arr, key);
+
+if (result !== -5e4)
+    throw new Error("bad result: " + result);

JSTests/microbenchmarks/array-indexof-string-8bit-short.js

@@ -0,0 +1,23 @@
+function makeString(len, ch) {
+    let s = "";
+    for (let i = 0; i < len; ++i)
+        s += ch;
+    return s;
+}
+
+function test(arr, key) {
+    return arr.indexOf(key);
+}
+noInline(test);
+
+let arr = [];
+for (let i = 0; i < 64; ++i)
+    arr.push(String.fromCharCode(65 + (i % 26)) + makeString(3, "x"));
+
+let key = "@" + makeString(3, "x");
+let result = 0;
+for (let i = 0; i < 5e4; ++i)
+    result += test(arr, key);
+
+if (result !== -5e4)
+    throw new Error("bad result: " + result);

JSTests/microbenchmarks/await-object-literal.js

@@ -0,0 +1,14 @@
+// Stresses isDefinitelyNonThenable() through `await object`, the dominant pattern
+// in async functions returning plain objects.
+
+async function run() {
+    let acc = 0;
+    for (let i = 0; i < 1e6; i++) {
+        const o = await { a: i, b: i + 1, c: i + 2 };
+        acc += o.a;
+    }
+    return acc;
+}
+
+run();
+drainMicrotasks();

JSTests/microbenchmarks/date-now-elapsed.js

@@ -0,0 +1,7 @@
+var sum = 0;
+var start = Date.now();
+for (var i = 0; i < 1e6; ++i) {
+    var diff = Date.now() - start;
+    if (diff >= 0 && diff < 1e9)
+        sum += diff;
+}

JSTests/microbenchmarks/date-now.js

@@ -0,0 +1,3 @@
+var sum = 0;
+for (var i = 0; i < 1e6; ++i)
+    sum += Date.now();

JSTests/microbenchmarks/promise-all-non-thenable-object.js

@@ -0,0 +1,8 @@
+const array = [];
+for (let i = 0; i < 12; i++)
+    array.push({ value: i });
+
+for (var i = 0; i < 1e4; ++i)
+    Promise.all(array);
+
+drainMicrotasks();

JSTests/microbenchmarks/promise-all-non-thenable.js

@@ -0,0 +1,8 @@
+const array = [];
+for (let i = 0; i < 12; i++)
+    array.push(i);
+
+for (var i = 0; i < 1e4; ++i)
+    Promise.all(array);
+
+drainMicrotasks();

JSTests/microbenchmarks/promise-all-settled-non-thenable.js

@@ -0,0 +1,8 @@
+const array = [];
+for (let i = 0; i < 12; i++)
+    array.push(i);
+
+for (var i = 0; i < 1e4; ++i)
+    Promise.allSettled(array);
+
+drainMicrotasks();

JSTests/microbenchmarks/promise-race-non-thenable.js

@@ -0,0 +1,8 @@
+const array = [];
+for (let i = 0; i < 12; i++)
+    array.push(i);
+
+for (var i = 0; i < 1e4; ++i)
+    Promise.race(array);
+
+drainMicrotasks();

JSTests/microbenchmarks/promise-resolve-non-thenable-object.js

@@ -0,0 +1,2 @@
+for (var i = 0; i < 1e6; ++i)
+    Promise.resolve({ a: i, b: i + 1, c: i + 2 });

JSTests/microbenchmarks/promise-resolve-object-literal.js

@@ -0,0 +1,6 @@
+// Stresses isDefinitelyNonThenable() through Promise.resolve(object). Resolving a
+// plain object literal must check whether it is a thenable, which walks the
+// prototype chain unless cached on the Structure.
+
+for (var i = 0; i < 1e6; ++i)
+    Promise.resolve({ a: i, b: i + 1, c: i + 2 });

JSTests/microbenchmarks/promise-then-chain-object-literal.js

@@ -0,0 +1,8 @@
+// Stresses isDefinitelyNonThenable() through a `.then()` handler chain that returns
+// plain object literals — every link must check whether the returned object is a
+// thenable.
+
+let p = Promise.resolve({ a: 1, b: 2, c: 3 });
+for (let i = 0; i < 1e6; i++)
+    p = p.then((x) => ({ a: x.a + 1, b: x.b + 1, c: x.c + 1 }));
+drainMicrotasks();

JSTests/microbenchmarks/regexp-match-digit-cached.js

@@ -0,0 +1,14 @@
+// Hot-path microbenchmark for String.prototype.match with a cached primordial
+// RegExp argument. The DFG StringMatch node is converted to RegExpMatchFast in
+// fixup, guarded by a CheckStructure on the primordial RegExp structure.
+
+function match(string, regexp)
+{
+    return string.match(regexp);
+}
+noInline(match);
+
+var string = "abc1def2ghi3jkl4mno5";
+var regexp = /[0-9]/g;
+for (var i = 0; i < 1e6; ++i)
+    match(string, regexp);

JSTests/microbenchmarks/regexp-match-digit-literal.js

@@ -0,0 +1,13 @@
+// Hot-path microbenchmark for String.prototype.match with a RegExp literal
+// allocated on every call. Stresses the primordial-RegExp fast path together
+// with regex allocation.
+
+function match(string)
+{
+    return string.match(/[0-9]/g);
+}
+noInline(match);
+
+var string = "abc1def2ghi3jkl4mno5";
+for (var i = 0; i < 1e6; ++i)
+    match(string);

JSTests/microbenchmarks/string-match-digit-short.js

@@ -0,0 +1,14 @@
+// Hot-path microbenchmark for String.prototype.match with a short literal
+// string regexp source. This exercises the DFG StringMatch fast path for the
+// common case where the regexp arg is a string and gets coerced via
+// RegExp construction.
+
+function match(string, regexp)
+{
+    return string.match(regexp);
+}
+noInline(match);
+
+var string = "abc1def2ghi3jkl4mno5";
+for (var i = 0; i < 1e7; ++i)
+    match(string, "[0-9]");

JSTests/microbenchmarks/string-match-letter-short.js

@@ -0,0 +1,12 @@
+// Hot-path microbenchmark for String.prototype.match with a single-char
+// literal pattern. Targets the simple non-global match fast path.
+
+function match(string, regexp)
+{
+    return string.match(regexp);
+}
+noInline(match);
+
+var string = "alpha bravo charlie delta echo foxtrot golf";
+for (var i = 0; i < 1e7; ++i)
+    match(string, "a");