Merge upstream 2023 11 11

.clangd

@@ -7,3 +7,13 @@ If:
     PathMatch: [.*\.cpp]
 CompileFlags:
     Add: [--include=config.h]
+---
+If:
+    PathMatch: [.*\.mm]
+CompileFlags:
+    Add: [-xobjective-c++, --include=config.h, -std=c++2a]
+---
+If:
+    PathMatch: [.*\.m]
+CompileFlags:
+    Add: [-xobjective-c, --include=config.h]

.github/CODEOWNERS

@@ -95,14 +95,16 @@
 /Source/WebCore/editing @rniwa
 /LayoutTests/editing @rniwa
 
+/Source/WebCore/Modules/applepay @aprotyas
+/Source/WebCore/Modules/applepay-ams-ui @aprotyas
 /Source/WebCore/Modules/applicationmanifest/ @marcoscaceres
 /Source/WebCore/Modules/beacon @cdumez
 /Source/WebCore/Modules/contact-picker @marcoscaceres
 /Source/WebCore/Modules/entriesapi @cdumez
 /Source/WebCore/Modules/geolocation @cdumez @marcoscaceres
 /Source/WebCore/Modules/model-element @graouts @marcoscaceres
 /Source/WebCore/Modules/notifications @cdumez
-/Source/WebCore/Modules/paymentrequest @marcoscaceres
+/Source/WebCore/Modules/paymentrequest @aprotyas @marcoscaceres
 /Source/WebCore/Modules/permissions @marcoscaceres
 /Source/WebCore/Modules/screen-wake-lock @marcoscaceres
 /Source/WebCore/Modules/web-locks @cdumez
@@ -123,9 +125,11 @@
 
 /Source/WebCore/crypto/ @zdobersek
 
-/LayoutTests/http/tests/paymentrequest @marcoscaceres
+/LayoutTests/http/tests/paymentrequest @aprotyas @marcoscaceres
+/LayoutTests/http/tests/ssl/applepay @aprotyas
+/LayoutTests/http/tests/ssl/applepay-ams-ui @aprotyas
 /LayoutTests/imported/w3c/web-platform-tests/geolocation-API @marcoscaceres
-/LayoutTests/imported/w3c/web-platform-tests/payment-request @marcoscaceres
+/LayoutTests/imported/w3c/web-platform-tests/payment-request @aprotyas @marcoscaceres
 /LayoutTests/imported/w3c/web-platform-tests/permissions @marcoscaceres
 /LayoutTests/imported/w3c/web-platform-tests/screen-orientation @marcoscaceres
 /LayoutTests/imported/w3c/web-platform-tests/web-share @marcoscaceres
@@ -140,11 +144,14 @@
 /Source/WebKit/NetworkProcess @cdumez
 /Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in @brentfulgham @pvollan
 /Source/WebKit/Platform @cdumez
+/Source/WebKit/Platform/*/Payment* @aprotyas
 /Source/WebKit/Resources/SandboxProfiles @brentfulgham @pvollan
+/Source/WebKit/Shared/ApplePay @aprotyas
 /Source/WebKit/Shared/Sandbox @brentfulgham @pvollan
 /Source/WebKit/UIProcess @cdumez
 /Source/WebKit/UIProcess/Extensions @b-weinstein @xeenon
 /Source/WebKit/WebProcess @cdumez
+/Source/WebKit/WebProcess/ApplePay @aprotyas
 /Source/WebKit/WebProcess/Extensions @b-weinstein @xeenon
 /Source/WebKit/WebProcess/com.apple.WebProcess.sb.in  @brentfulgham @pvollan
 
@@ -208,11 +215,10 @@ wpe/ @WebKit/glib-reviewers @zdobersek
 # ================================================================================
 # WebGPU
 
-/Source/WebCore/Modules/webgpu @litherum @mwyrzykowski
-/Source/WebCore/PAL/pal/graphics/WebGPU @litherum @mwyrzykowski
-/Source/WebGPU @litherum @mwyrzykowski
-/Source/WebKit/Shared/WebGPU @litherum @mwyrzykowski
-/Source/WebKit/WebProcess/GPU/graphics/WebGPU @litherum @mwyrzykowski
-/Source/WebKit/GPUProcess/graphics/WebGPU @litherum @mwyrzykowski
+/Source/WebCore/Modules/webgpu @tadeuzagallo @mwyrzykowski
+/Source/WebGPU @tadeuzagallo @mwyrzykowski
+/Source/WebKit/Shared/WebGPU @tadeuzagallo @mwyrzykowski
+/Source/WebKit/WebProcess/GPU/graphics/WebGPU @tadeuzagallo @mwyrzykowski
+/Source/WebKit/GPUProcess/graphics/WebGPU @tadeuzagallo @mwyrzykowski
 
-/Source/WebGPU/WGSL @litherum @djg @tadeuzagallo
+/Source/WebGPU/WGSL @mwyrzykowski @djg @tadeuzagallo

.gitignore

@@ -11,10 +11,10 @@ project.xcworkspace
 xcuserdata
 DerivedData
 .mailmap
+results
 
 # Ignore Buildstream local files
-/Tools/buildstream/.bst
-/Tools/buildstream/.venv
+/Tools/buildstream/.bst2
 /Tools/buildstream/cache
 /Tools/buildstream/flatpak-version.yml
 /Tools/buildstream/repo
@@ -71,3 +71,6 @@ Source/ThirdParty/ANGLE/parsetab.py
 
 # Ignore user CMake presets
 CMakeUserPresets.json
+
+# Ignore BenchmarkTemp folder generated by run-jsc-benchmarks
+BenchmarkTemp

.submitproject

@@ -0,0 +1,5 @@
+[submitproject "filter"]
+    includedSubdirectoryPatterns = Configurations/
+    includedSubdirectoryPatterns = Source/
+    excludedSubdirectoryPatterns = Source/third_party/boringssl/src/util
+    excludedSubdirectoryPatterns = Source/webrtc/examples

CMakePresets.json

@@ -9,7 +9,6 @@
         {
             "name": "release",
             "hidden": true,
-            "binaryDir": "WebKitBuild/Release",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": {
                     "type": "STRING",
@@ -20,7 +19,6 @@
         {
             "name": "debug",
             "hidden": true,
-            "binaryDir": "WebKitBuild/Debug",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": {
                     "type": "STRING",
@@ -60,22 +58,24 @@
         {
             "name": "gtk-release",
             "displayName": "GTK Release",
-            "inherits": ["gtk", "release"]
+            "inherits": ["gtk", "release"],
+            "binaryDir": "WebKitBuild/GTK/Release"
         },
         {
             "name": "gtk-debug",
             "displayName": "GTK Debug",
-            "inherits": ["gtk", "debug"]
+            "inherits": ["gtk", "debug"],
+            "binaryDir": "WebKitBuild/GTK/Debug"
         },
         {
             "name": "gtk-dev-release",
             "displayName": "GTK Development Release",
-            "inherits": ["gtk", "dev", "release"]
+            "inherits": ["gtk-release", "dev"]
         },
         {
             "name": "gtk-dev-debug",
             "displayName": "GTK Development Debug",
-            "inherits": ["gtk", "dev", "debug"]
+            "inherits": ["gtk-debug", "dev"]
         }
     ],
     "buildPresets": [
@@ -91,12 +91,12 @@
         },
         {
             "name": "gtk-dev-release",
-            "displayName": "GTK Dev Release",
+            "displayName": "GTK Development Release",
             "configurePreset": "gtk-dev-release"
         },
         {
             "name": "gtk-dev-debug",
-            "displayName": "GTK Dev Debug",
+            "displayName": "GTK Development Debug",
             "configurePreset": "gtk-dev-debug"
         }
     ]

Configurations/CommonBase.xcconfig

@@ -52,6 +52,9 @@ OTHER_CPLUSPLUSFLAGS = $(inherited) $(WK_COMMON_OTHER_CPLUSPLUSFLAGS);
 WK_COMMON_OTHER_LDFLAGS = $(WK_SANITIZER_OTHER_LDFLAGS);
 OTHER_LDFLAGS = $(inherited) $(WK_COMMON_OTHER_LDFLAGS);
 
+WK_COMMON_OTHER_TAPI_FLAGS = -x objective-c++ -std=c++2a -fno-rtti $(WK_SANITIZER_OTHER_TAPI_FLAGS);
+OTHER_TAPI_FLAGS = $(inherited) $(WK_COMMON_OTHER_TAPI_FLAGS);
+
 WK_COMMON_WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wextra -Wformat=2 -Wundef;
 WARNING_CFLAGS = $(inherited) $(WK_COMMON_WARNING_CFLAGS);
 

Configurations/SDKAdditions.xcconfig

@@ -26,13 +26,21 @@
 // FIXME: Add unversioned sparse SDKs for headers and framework stubs that we can share between OS versions.
 //WK_HAS_UNVERSIONED_SDK_ADDITIONS = ;
 
-WK_HAS_VERSIONED_SDK_ADDITIONS = YES;
-WK_HAS_VERSIONED_SDK_ADDITIONS[sdk=macos*] = $(WK_HAS_VERSIONED_SDK_ADDITIONS_$(USE_INTERNAL_SDK);
-WK_HAS_VERSIONED_SDK_ADDITIONS_ = $(WK_HAS_VERSIONED_SDK_ADDITIONS$(WK_MACOS_1400));
-WK_HAS_VERSIONED_SDK_ADDITIONS_MACOS_SINCE_1400 = YES;
+WK_HAS_VERSIONED_SDK_ADDITIONS = $(WK_NOT_$(USE_INTERNAL_SDK));
+// Prior to Sonoma, downlevel macOS and STP builds link against AppleJPEGXL.framework.
+WK_HAS_VERSIONED_SDK_ADDITIONS[sdk=macos*] = $(WK_HAS_VERSIONED_SDK_ADDITIONS$(WK_MACOS_1400));
+WK_HAS_VERSIONED_SDK_ADDITIONS_MACOS_BEFORE_1400 = YES;
+WK_HAS_VERSIONED_SDK_ADDITIONS_MACOS_SINCE_1400 = $(WK_NOT_$(USE_INTERNAL_SDK));
 
 WK_ADDITIONAL_SDKS = $(WK_ADDITIONAL_SDKS_UNVERSIONED_$(WK_HAS_UNVERSIONED_SDK_ADDITIONS)_VERSIONED_$(WK_HAS_VERSIONED_SDK_ADDITIONS));
 WK_ADDITIONAL_SDKS_UNVERSIONED__VERSIONED_ = ;
 WK_ADDITIONAL_SDKS_UNVERSIONED__VERSIONED_YES = $(WK_VERSIONED_SDK_ADDITIONS_PATH);
 WK_ADDITIONAL_SDKS_UNVERSIONED_YES_VERSIONED_ = $(WK_UNVERSIONED_SDK_ADDITIONS_PATH);
 WK_ADDITIONAL_SDKS_UNVERSIONED_YES_VERSIONED_YES = $(WK_UNVERSIONED_SDK_ADDITIONS_PATH) $(WK_VERSIONED_SDK_ADDITIONS_PATH);
+
+// The SDK directory where private frameworks are expected to be. Set to the base SDK when building
+// internally or on macOS, and the additions SDK otherwise.
+WK_PRIVATE_SDK_DIR = $(WK_PRIVATE_SDK_DIR_$(USE_INTERNAL_SDK));
+WK_PRIVATE_SDK_DIR_ = $(SDK_DIR_WebKitSDKAdditions);
+WK_PRIVATE_SDK_DIR_[sdk=macos*] = $(SDK_DIR);
+WK_PRIVATE_SDK_DIR_YES = $(SDK_DIR);

Configurations/Sanitizers.xcconfig

@@ -31,18 +31,24 @@ WK_SANITIZER_GCC_OPTIMIZATION_LEVEL_Debug = 0;
 WK_SANITIZER_GCC_OPTIMIZATION_LEVEL_Production = 1;
 WK_SANITIZER_GCC_OPTIMIZATION_LEVEL_Release = 1;
 
-WK_SANITIZER_OTHER_CFLAGS = $(WK_ANY_SANITIZER_CFLAGS_$(WK_ANY_SANITIZER_ENABLED)) $(WK_ADDRESS_SANITIZER_OTHER_CFLAGS_$(ENABLE_ADDRESS_SANITIZER)) $(WK_UNDEFINED_BEHAVIOR_SANITIZER_OTHER_CFLAGS_$(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER));
+WK_SANITIZER_OTHER_CFLAGS = $(WK_ANY_SANITIZER_CFLAGS_$(WK_ANY_SANITIZER_ENABLED)) $(WK_ADDRESS_SANITIZER_OTHER_CFLAGS_$(ENABLE_ADDRESS_SANITIZER)) $(WK_UNDEFINED_BEHAVIOR_SANITIZER_OTHER_CFLAGS_$(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER)) $(WK_LIBFUZZER_OTHER_CFLAGS_$(ENABLE_LIBFUZZER));
 
-WK_SANITIZER_OTHER_CPLUSPLUSFLAGS = $(WK_ADDRESS_SANITIZER_OTHER_CPLUSPLUSFLAGS_$(ENABLE_ADDRESS_SANITIZER));
+WK_SANITIZER_OTHER_CPLUSPLUSFLAGS = $(WK_ADDRESS_SANITIZER_OTHER_CPLUSPLUSFLAGS_$(ENABLE_ADDRESS_SANITIZER)) $(WK_LIBFUZZER_OTHER_CPLUSPLUSFLAGS_$(ENABLE_LIBFUZZER));
 
-WK_SANITIZER_OTHER_LDFLAGS = $(WK_ANY_SANITIZER_LDFLAGS_$(WK_ANY_SANITIZER_ENABLED));
+WK_SANITIZER_OTHER_LDFLAGS = $(WK_ANY_SANITIZER_LDFLAGS_$(WK_ANY_SANITIZER_ENABLED)) $(WK_LIBFUZZER_OTHER_LDFLAGS_$(ENABLE_LIBFUZZER));
+
+WK_SANITIZER_OTHER_TAPI_FLAGS = $(WK_SANITIZER_OTHER_TAPI_FLAGS_ASAN_$(ENABLE_ADDRESS_SANITIZER)) $(WK_SANITIZER_OTHER_TAPI_FLAGS_LIBFUZZER_$(ENABLE_LIBFUZZER)) $(WK_SANITIZER_OTHER_TAPI_FLAGS_TSAN_$(ENABLE_THREAD_SANITIZER)) $(WK_SANITIZER_OTHER_TAPI_FLAGS_UBSAN_$(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER));
+WK_SANITIZER_OTHER_TAPI_FLAGS_ASAN_YES = -Xparser -fsanitize=address;
+WK_SANITIZER_OTHER_TAPI_FLAGS_LIBFUZZER_YES = -Xparser -fsanitize=fuzzer;
+WK_SANITIZER_OTHER_TAPI_FLAGS_TSAN_YES = -Xparser -fsanitize=thread;
+WK_SANITIZER_OTHER_TAPI_FLAGS_UBSAN_YES = -Xparser -fsanitize=undefined;
 
 // All Sanitizers
 
 // FIXME: Tell Xcode not to compile host-side tools with sanitizers enabled (see <rdar://99386433>).
 // Workaround is to use `WK_SANITIZER_DISALLOWED = YES`.
 
-WK_ANY_SANITIZER_ENABLED = $(WK_AND_$(WK_OR_$(ENABLE_ADDRESS_SANITIZER)_$(WK_OR_$(ENABLE_THREAD_SANITIZER)_$(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER)))_$(WK_NOT_$(WK_SANITIZER_DISALLOWED)));
+WK_ANY_SANITIZER_ENABLED = $(WK_AND_$(WK_OR_$(ENABLE_ADDRESS_SANITIZER)_$(WK_OR_$(ENABLE_THREAD_SANITIZER)_$(WK_OR_$(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER)_$(ENABLE_LIBFUZZER))))_$(WK_NOT_$(WK_SANITIZER_DISALLOWED)));
 
 // -DRELEASE_WITHOUT_OPTIMIZATIONS is from <wtf/Compiler.h>.
 WK_ANY_SANITIZER_CFLAGS_YES = -DRELEASE_WITHOUT_OPTIMIZATIONS -fno-omit-frame-pointer -g;
@@ -82,3 +88,9 @@ WK_XCODE_VERSION_AFTER_13_3_1700 = YES;
 // -fno-delete-null-pointer-checks: do not let the compiler remove nullptr checks that could otherwise be removed because they are considered undefined behavior.
 // -fno-optimize-sibling-calls: disable tail call elimination for more accurate crash stacks.
 WK_UNDEFINED_BEHAVIOR_SANITIZER_OTHER_CFLAGS_YES = -fno-delete-null-pointer-checks -fno-optimize-sibling-calls -fno-sanitize=vptr -fsanitize=enum,return;
+
+// Libfuzzer
+
+WK_LIBFUZZER_COVERAGE = inline-8bit-counters,trace-cmp;
+WK_LIBFUZZER_OTHER_CFLAGS_YES = -fsanitize-coverage=$(WK_LIBFUZZER_COVERAGE) -Wno-error;
+WK_LIBFUZZER_OTHER_LDFLAGS_YES = -fsanitize-coverage=$(WK_LIBFUZZER_COVERAGE);

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 = 616;
+MAJOR_VERSION = 618;
 MINOR_VERSION = 1;
-TINY_VERSION = 22;
+TINY_VERSION = 5;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);

Configurations/WebKitProjectPaths.xcconfig

@@ -33,6 +33,13 @@ WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREF
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
 
+// Set WK_CONFIGURATION_BUILD_DIR to customize the directory WebKit builds into
+// without affecting other projects in the build request. Avoid $(inherited)
+// due to rdar://118201428.
+CONFIGURATION_BUILD_DIR = $(CONFIGURATION_BUILD_DIR_$(WK_EMPTY_$(WK_CONFIGURATION_BUILD_DIR)));
+CONFIGURATION_BUILD_DIR_ = $(WK_CONFIGURATION_BUILD_DIR);
+CONFIGURATION_BUILD_DIR_YES = $(CONFIGURATION_BUILD_DIR);
+
 WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;
 WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_YES = /usr/local/include/safari-sdk;
@@ -74,26 +81,22 @@ WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADE
 WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH[config=Production] = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions;
 
 // 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)$(WK_WORKSPACE_DIR_2_$(SRCROOT:dir:standardizepath:dir:standardizepath:file):standardizepath)$(WK_WORKSPACE_DIR_3_$(SRCROOT:dir:standardizepath:dir:standardizepath:dir:standardizepath:file):standardizepath)$(WK_WORKSPACE_DIR_4_$(SRCROOT:dir:standardizepath:dir:standardizepath:dir:standardizepath:dir:standardizepath:file):standardizepath);
+WK_WORKSPACE_DIR = $(WK_WORKSPACE_DIR_1_$(SRCROOT:dir:standardizepath:file):standardizepath)$(WK_WORKSPACE_DIR_2_$(SRCROOT:dir:standardizepath:dir:standardizepath:file):standardizepath)$(WK_WORKSPACE_DIR_3_$(SRCROOT:dir:standardizepath:dir:standardizepath:dir:standardizepath:file):standardizepath)$(WK_WORKSPACE_DIR_4_$(SRCROOT:dir:standardizepath:dir:standardizepath:dir:standardizepath:dir:standardizepath:file):standardizepath)$(WK_WORKSPACE_DIR_5_$(SRCROOT:dir:standardizepath:dir:standardizepath:dir:standardizepath:dir:standardizepath:dir:standardizepath:file):standardizepath)$(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)/../..;
 WK_WORKSPACE_DIR_1_Tools = $(SRCROOT)/../..;
 WK_WORKSPACE_DIR_2_Source = $(SRCROOT)/../../..;
 WK_WORKSPACE_DIR_2_Tools = $(SRCROOT)/../../..;
 WK_WORKSPACE_DIR_3_Source = $(SRCROOT)/../../../..;
 WK_WORKSPACE_DIR_4_Source = $(SRCROOT)/../../../../..;
-
-WK_PRIVATE_FRAMEWORK_STUBS_DIR = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_[sdk=macos*] = $(WK_WORKSPACE_DIR)/WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/$(TARGET_MAC_OS_X_VERSION_MAJOR);
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_[sdk=iphone*] = $(WK_WORKSPACE_DIR)/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_[sdk=appletv*] = $(WK_WORKSPACE_DIR)/WebKitLibraries/WebKitPrivateFrameworkStubs/appletvos/$(WK_TARGET_TVOS_VERSION_MAJOR);
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_[sdk=watch*] = $(WK_WORKSPACE_DIR)/WebKitLibraries/WebKitPrivateFrameworkStubs/watchos/$(WK_TARGET_WATCHOS_VERSION_MAJOR);
+WK_WORKSPACE_DIR_5_Source = $(SRCROOT)/../../../../../..;
+WK_WORKSPACE_DIR_6_Source = $(SRCROOT)/../../../../../../..;
 
 WK_DOWNLEVEL_FRAMEWORK_STUBS_DIR[sdk=macos*] = $(WK_DOWNLEVEL_FRAMEWORK_STUBS_DIR$(WK_MACOS_1400);
 WK_DOWNLEVEL_FRAMEWORK_STUBS_DIR_MACOS_BEFORE_1400 = $(WK_WORKSPACE_DIR)/WebKitLibraries/DownlevelFrameworkStubs/$(TARGET_MAC_OS_X_VERSION_MAJOR);
 
 WK_VERSIONED_SDK_ADDITIONS_PATH = $(WK_VERSIONED_SDK_ADDITIONS_PATH_$(USE_INTERNAL_SDK));
-WK_VERSIONED_SDK_ADDITIONS_PATH_ = $(WK_WORKSPACE_DIR)/WebKitLibraries/SDKs/$(PLATFORM_NAME)$($(DEPLOYMENT_TARGET_SETTING_NAME):base).0-additions.sdk;
-WK_VERSIONED_SDK_ADDITIONS_PATH_YES = $(WK_WORKSPACE_DIR)/WebKitLibraries/SDKs/$(PLATFORM_NAME)$($(DEPLOYMENT_TARGET_SETTING_NAME):base).0.internal-additions.sdk;
+WK_VERSIONED_SDK_ADDITIONS_PATH_ = $(WK_WORKSPACE_DIR)/WebKitLibraries/SDKs/$(PLATFORM_NAME)$($(DEPLOYMENT_TARGET_SETTING_NAME):base:base).0-additions.sdk;
+WK_VERSIONED_SDK_ADDITIONS_PATH_YES = $(WK_WORKSPACE_DIR)/WebKitLibraries/SDKs/$(PLATFORM_NAME)$($(DEPLOYMENT_TARGET_SETTING_NAME):base:base).0.internal-additions.sdk;
 
 WTF_BUILD_SCRIPTS_DIR = $(WTF_BUILD_SCRIPTS_DIR_$(CONFIGURATION));
 WTF_BUILD_SCRIPTS_DIR_Release = $(WTF_BUILD_SCRIPTS_DIR_engineering);

JSTests/ChakraCore/test/Closures/bug_OS_2299723.baseline-jsc

@@ -1,4 +1,5 @@
+eval('var x = 5') threw 'Can't create duplicate variable in eval: 'x''
 x: 5
-eval('var y = 5') threw 'Attempted to assign to readonly property.'
+eval('var y = 5') threw 'Can't create duplicate variable in eval: 'y''
 eval('y = 5') threw 'Attempted to assign to readonly property.'
 y: 1

JSTests/ChakraCore/test/LetConst/r.baseline-jsc

@@ -1,2 +1,2 @@
 ReferenceError: Can't find variable: x
-SyntaxError: Unexpected number '0'. Parse error.
+SyntaxError: Unexpected number '0'

JSTests/ChakraCore/test/Lib/noargs_2.baseline-jsc

@@ -10,7 +10,8 @@ encodeURI = undefined
 decodeURIComponent = undefined
 encodeURIComponent = undefined
 Object = [object Object]
-Function = function anonymous() {
+Function = function anonymous(
+) {
 
 }
 Array = 

JSTests/ChakraCore/test/es5/exceptions3.baseline-jsc

@@ -19,7 +19,7 @@ undefined.toString();   -expected: es3, es5 TypeError ::: TypeError: undefined i
  null.anchor();;   -expected: es3, es5 TypeError ::: TypeError: null is not an object (evaluating 'null.anchor')
  NaN.anchor();;   -expected: es3, es5 TypeError ::: TypeError: NaN.anchor is not a function. (In 'NaN.anchor()', 'NaN.anchor' is undefined)
  true.anchor();;   -expected: es3, es5 TypeError ::: TypeError: true.anchor is not a function. (In 'true.anchor()', 'true.anchor' is undefined)
-new Array(12.4) - RangeError exception:  expected in es3 and es5::: RangeError: Array size is not a small enough positive integer.
+new Array(12.4) - RangeError exception:  expected in es3 and es5::: RangeError: Array length must be a positive integer of safe magnitude.
 new Array(12.4); x.length = 12.5; - RangeError exception: es5-expected, ES3-not expected  ::: RangeError: Invalid array length
 (123.45).toFixed(25);  - no exception: not expected es3, es5
 (123.45).toExponential(-25); - RangeError exception : expected es3, es5 ::: RangeError: toExponential() argument must be between 0 and 100

JSTests/ChakraCore/test/typedarray/arraybufferType.baseline-jsc

@@ -9,8 +9,11 @@ bar = 42
 slice
 byteLength
 resize
+transfer
+transferToFixedLength
 resizable
 maxByteLength
+detached
 constructor
 aaa
 foo
@@ -23,8 +26,11 @@ bar = 42
 slice
 byteLength
 resize
+transfer
+transferToFixedLength
 resizable
 maxByteLength
+detached
 constructor
 aaa
 foo

JSTests/microbenchmarks/array-filter-inline.js

@@ -0,0 +1,13 @@
+var array = [];
+for (var i = 0; i < 1000; ++i)
+    array.push(i);
+
+function test(array)
+{
+    return array.filter((value) => value < 1e5);
+}
+noInline(test);
+
+for (var i = 0; i < 1e4; ++i) {
+    test(array);
+}

JSTests/microbenchmarks/array-from-array.js

@@ -0,0 +1,4 @@
+var a1 = new Array(1024);
+a1.fill(99);
+for (var i = 0; i < 1e2; ++i)
+    var a2 = Array.from(a1);

JSTests/microbenchmarks/array-from-derived-object-func.js

@@ -1,4 +1,4 @@
-//@ $skipModes << :lockdown if $buildType == "debug"
+//@ $skipModes << :lockdown if ($buildType == "debug") or ($architecture == "mips")
 
 function shouldBe(actual, expected) {
     if (actual !== expected)

JSTests/microbenchmarks/custom-accessor-thin-air-setter.js

@@ -0,0 +1,22 @@
+//@ skip if $model == "Apple Watch Series 3" # added by mark-jsc-stress-test.py
+function assert(b) {
+    if (!b)
+        throw new Error;
+}
+
+function test5() {
+    function set(o, value) {
+        o.customAccessor = value;
+    }
+    noInline(set);
+
+    const o = $vm.createCustomTestGetterSetter();
+
+    for (let i = 0; i < 500000; ++i) {
+        set(o, 1337);
+    }
+    for (let i = 0; i < 500000; ++i) {
+        set(o, 1337);
+    }
+}
+test5();