Merge pull request movableink#20 from movableink/merge-upstream-2023-…

…12-18

Merge upstream 2023 12 18

.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]

.editorconfig

@@ -1,6 +1,6 @@
 # Editor configuration, see https://editorconfig.org
 
-[*.{c,cpp,h,rb}]
+[*.{c,cpp,h,rb,py,pl}]
 indent_style = space
 indent_size = 4
 tab_width = 4

.github/CODEOWNERS

@@ -74,16 +74,16 @@
 # ================================================================================
 # Web Inspector
 
-/Source/JavaScriptCore/debugger @patrickangle
-/Source/JavaScriptCore/inspector @patrickangle
-/Source/WebCore/inspector @patrickangle
+/Source/JavaScriptCore/debugger @dcrousso @patrickangle
+/Source/JavaScriptCore/inspector @dcrousso @patrickangle
+/Source/WebCore/inspector @dcrousso @patrickangle
 /Source/WebInspectorUI @dcrousso @patrickangle
-/Source/WebKit/UIProcess/Inspector @patrickangle
-/Source/WebKit/WebProcess/Inspector @patrickangle
-/Tools/Scripts/webkitpy/inspector @patrickangle
-/LayoutTests/http/tests/inspector @patrickangle
-/LayoutTests/http/tests/websocket/tests/hybi/inspector @patrickangle
-/LayoutTests/inspector @patrickangle
+/Source/WebKit/UIProcess/Inspector @dcrousso @patrickangle
+/Source/WebKit/WebProcess/Inspector @dcrousso @patrickangle
+/Tools/Scripts/webkitpy/inspector @dcrousso @patrickangle
+/LayoutTests/http/tests/inspector @dcrousso @patrickangle
+/LayoutTests/http/tests/websocket/tests/hybi/inspector @dcrousso @patrickangle
+/LayoutTests/inspector @dcrousso @patrickangle
 
 # ================================================================================
 # WebCore
@@ -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
 
@@ -159,6 +166,11 @@
 /Source/cmake/WebKitCompilerFlags.cmake @mcatanzaro
 /Source/cmake/WebKitFeatures.cmake @mcatanzaro
 
+# ================================================================================
+# Xcode
+
+*.xcconfig @emw-apple
+
 # ================================================================================
 # Linux graphics
 
@@ -198,6 +210,19 @@ xdg/ @WebKit/glib-reviewers
 wpe/ @WebKit/glib-reviewers @zdobersek
 **/wpe/qt/ @philn
 
+# Don't want to own these
+/Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/util/ar/testdata/linux
+/Source/ThirdParty/libwebrtc/Source/third_party/libaom/source/config/linux
+/Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/config/linux
+/Source/ThirdParty/libwebrtc/Source/webrtc/examples/peerconnection/client/linux
+/Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/linux
+/Source/ThirdParty/libwebrtc/Source/webrtc/modules/desktop_capture/linux
+/Source/ThirdParty/libwebrtc/Source/webrtc/modules/video_capture/linux
+/Source/ThirdParty/libwebrtc/Source/webrtc/test/linux
+/Source/ThirdParty/libwebrtc/Source/webrtc/tools_webrtc/audio_quality/linux
+/Source/ThirdParty/libwebrtc/Source/webrtc/tools_webrtc/video_quality_toolchain/linux
+/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_tools/testing/golang/linux
+
 /LayoutTests/platform/glib/
 /LayoutTests/platform/gtk/
 /LayoutTests/platform/gtk4/
@@ -208,11 +233,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,57 @@
         {
             "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"]
+        },
+        {
+            "name": "wpe",
+            "hidden": true,
+            "generator": "Ninja",
+            "cacheVariables": {
+                "PORT": {
+                    "type": "STRING",
+                    "value": "WPE"
+                }
+            }
+        },
+        {
+            "name": "wpe-release",
+            "displayName": "WPE Release",
+            "inherits": ["wpe", "release"],
+            "binaryDir": "WebKitBuild/WPE/Release"
+        },
+        {
+            "name": "wpe-debug",
+            "displayName": "WPE Debug",
+            "inherits": ["wpe", "debug"],
+            "binaryDir": "WebKitBuild/WPE/Debug"
+        },
+        {
+            "name": "wpe-dev-release",
+            "displayName": "WPE Development Release",
+            "inherits": ["wpe-release", "dev"]
+        },
+        {
+            "name": "wpe-dev-debug",
+            "displayName": "WPE Development Debug",
+            "inherits": ["wpe-debug", "dev"]
         }
     ],
     "buildPresets": [
@@ -91,13 +124,33 @@
         },
         {
             "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"
+        },
+        {
+            "name": "wpe-release",
+            "displayName": "WPE Release",
+            "configurePreset": "wpe-release"
+        },
+        {
+            "name": "wpe-debug",
+            "displayName": "WPE Debug",
+            "configurePreset": "wpe-debug"
+        },
+        {
+            "name": "wpe-dev-release",
+            "displayName": "WPE Development Release",
+            "configurePreset": "wpe-dev-release"
+        },
+        {
+            "name": "wpe-dev-debug",
+            "displayName": "WPE Development Debug",
+            "configurePreset": "wpe-dev-debug"
         }
     ]
 }

Configurations/CommonBase.xcconfig

@@ -43,7 +43,7 @@ GCC_OPTIMIZATION_LEVEL = $(WK_GCC_OPTIMIZATION_LEVEL_SANITIZER_OVERRIDE_$(WK_ANY
 WK_GCC_OPTIMIZATION_LEVEL_SANITIZER_OVERRIDE_NO = $(WK_DEFAULT_GCC_OPTIMIZATION_LEVEL);
 WK_GCC_OPTIMIZATION_LEVEL_SANITIZER_OVERRIDE_YES = $(WK_SANITIZER_GCC_OPTIMIZATION_LEVEL);
 
-WK_COMMON_OTHER_CFLAGS = $(WK_LIBFUZZER_OTHER_FLAGS) $(WK_SANITIZER_OTHER_CFLAGS);
+WK_COMMON_OTHER_CFLAGS = $(WK_SANITIZER_OTHER_CFLAGS);
 OTHER_CFLAGS = $(inherited) $(WK_COMMON_OTHER_CFLAGS);
 
 WK_COMMON_OTHER_CPLUSPLUSFLAGS = $(WK_LIBCPP_ASSERTIONS_CFLAGS) $(WK_SANITIZER_OTHER_CPLUSPLUSFLAGS);
@@ -52,12 +52,12 @@ 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);
 
-WK_LIBFUZZER_OTHER_FLAGS = $(WK_ENABLE_LIBFUZZER_$(ENABLE_LIBFUZZER));
-WK_ENABLE_LIBFUZZER_YES = -DENABLE_LIBFUZZER=1;
-
 WK_LIBCPP_ASSERTIONS_CFLAGS = $(WK_LIBCPP_ASSERTIONS_CFLAGS_$(WK_PLATFORM_NAME));
 WK_LIBCPP_ASSERTIONS_CFLAGS_iphoneos = $(WK_LIBCPP_ASSERTIONS_CFLAGS$(WK_IOS_17));
 WK_LIBCPP_ASSERTIONS_CFLAGS_iphonesimulator = $(WK_LIBCPP_ASSERTIONS_CFLAGS$(WK_IOS_17));

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_FUZZILLI_OTHER_CFLAGS_$(ENABLE_FUZZILLI));
 
-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_FUZZILLI_OTHER_LDFLAGS_$(ENABLE_FUZZILLI));
+
+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,14 @@ 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 -DENABLE_LIBFUZZER=1;
+WK_LIBFUZZER_OTHER_LDFLAGS_YES = -fsanitize-coverage=$(WK_LIBFUZZER_COVERAGE);
+
+// Fuzzilli for JavaScriptCore
+
+WK_FUZZILLI_OTHER_CFLAGS_YES = -fsanitize-coverage=trace-pc-guard -DENABLE_FUZZILLI=1;
+WK_FUZZILLI_OTHER_LDFLAGS_YES = -fsanitize-coverage=trace-pc-guard;

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 = 10;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);