From 76e01e6d0ca58a1f946fab12c2d72d5874f83b8b Mon Sep 17 00:00:00 2001 From: Commit Queue Date: Sat, 23 Mar 2024 23:47:57 -0700 Subject: [PATCH] Unreviewed, reverting 276590@main. https://bugs.webkit.org/show_bug.cgi?id=271576 Broke the iOS Simulator build Reverted changeset: "Adopt Fatal Exceptions Entitlement" https://bugs.webkit.org/show_bug.cgi?id=271496 https://commits.webkit.org/276590@main Canonical link: https://commits.webkit.org/276606@main --- .../Scripts/process-entitlements.sh | 10 ------- Source/JavaScriptCore/entitlements.plist | 4 --- Source/WebKit/Scripts/process-entitlements.sh | 27 ------------------- .../WebContentProcessExtension.entitlements | 4 --- 4 files changed, 45 deletions(-) diff --git a/Source/JavaScriptCore/Scripts/process-entitlements.sh b/Source/JavaScriptCore/Scripts/process-entitlements.sh index 76a848660ce2..51abc995fc47 100755 --- a/Source/JavaScriptCore/Scripts/process-entitlements.sh +++ b/Source/JavaScriptCore/Scripts/process-entitlements.sh @@ -12,8 +12,6 @@ function plistbuddy() function mac_process_jsc_entitlements() { plistbuddy Add :com.apple.security.cs.allow-jit bool YES - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]] then if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 110000 )) @@ -32,8 +30,6 @@ function mac_process_jsc_entitlements() function mac_process_testapi_entitlements() { - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]] then plistbuddy Add :com.apple.security.cs.allow-jit bool YES @@ -60,8 +56,6 @@ function mac_process_testapi_entitlements() function maccatalyst_process_jsc_entitlements() { plistbuddy Add :com.apple.security.cs.allow-jit bool YES - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]] then @@ -83,8 +77,6 @@ function maccatalyst_process_testapi_entitlements() { plistbuddy Add :com.apple.rootless.storage.JavaScriptCore bool YES plistbuddy Add :com.apple.security.cs.allow-jit bool YES - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 110000 )) then @@ -108,8 +100,6 @@ function ios_family_process_jsc_entitlements() plistbuddy Add :com.apple.private.verified-jit bool YES plistbuddy Add :dynamic-codesigning bool YES plistbuddy Add :com.apple.developer.kernel.extended-virtual-addressing bool YES - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit } function ios_family_process_testapi_entitlements() diff --git a/Source/JavaScriptCore/entitlements.plist b/Source/JavaScriptCore/entitlements.plist index eee257ee53eb..aab0ffa32605 100644 --- a/Source/JavaScriptCore/entitlements.plist +++ b/Source/JavaScriptCore/entitlements.plist @@ -8,9 +8,5 @@ dynamic-codesigning - com.apple.security.fatal-exceptions - - jit - diff --git a/Source/WebKit/Scripts/process-entitlements.sh b/Source/WebKit/Scripts/process-entitlements.sh index 1a4cdde2feb4..623106f25bdb 100755 --- a/Source/WebKit/Scripts/process-entitlements.sh +++ b/Source/WebKit/Scripts/process-entitlements.sh @@ -13,8 +13,6 @@ function plistbuddy() function mac_process_webcontent_entitlements() { plistbuddy Add :com.apple.security.cs.allow-jit bool YES - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]] then @@ -42,8 +40,6 @@ function mac_process_webcontent_entitlements() function mac_process_webcontent_captiveportal_entitlements() { - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]] then plistbuddy Add :com.apple.private.webkit.use-xpc-endpoint bool YES @@ -77,8 +73,6 @@ function mac_process_webcontent_captiveportal_entitlements() function mac_process_gpu_entitlements() { - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]] then if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 101400 )) @@ -133,8 +127,6 @@ function mac_process_gpu_entitlements() function mac_process_network_entitlements() { - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit if [[ "${WK_USE_RESTRICTED_ENTITLEMENTS}" == YES ]] then if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 101500 )) @@ -249,8 +241,6 @@ function maccatalyst_process_webcontent_entitlements() plistbuddy Add :com.apple.runningboard.assertions.webkit bool YES plistbuddy Add :com.apple.private.webkit.use-xpc-endpoint bool YES plistbuddy Add :com.apple.QuartzCore.webkit-end-points bool YES - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 110000 )) then @@ -289,9 +279,6 @@ function maccatalyst_process_webcontent_captiveportal_entitlements() plistbuddy Add :com.apple.imageio.allowabletypes:2 string public.png plistbuddy Add :com.apple.imageio.allowabletypes:3 string com.compuserve.gif - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit - if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 110000 )) then plistbuddy Add :com.apple.developer.kernel.extended-virtual-addressing bool YES @@ -319,8 +306,6 @@ function maccatalyst_process_webcontent_captiveportal_entitlements() function maccatalyst_process_gpu_entitlements() { - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit plistbuddy Add :com.apple.security.network.client bool YES plistbuddy Add :com.apple.runningboard.assertions.webkit bool YES plistbuddy Add :com.apple.QuartzCore.webkit-end-points bool YES @@ -341,8 +326,6 @@ function maccatalyst_process_gpu_entitlements() function maccatalyst_process_network_entitlements() { - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit plistbuddy Add :com.apple.private.network.socket-delegate bool YES plistbuddy Add :com.apple.security.network.client bool YES plistbuddy Add :com.apple.runningboard.assertions.webkit bool YES @@ -384,10 +367,6 @@ function ios_family_process_webcontent_shared_entitlements() plistbuddy Add :com.apple.private.webinspector.proxy-application bool YES plistbuddy Add :com.apple.private.webkit.use-xpc-endpoint bool YES plistbuddy Add :com.apple.runningboard.assertions.webkit bool YES - - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit - if [[ "${PRODUCT_NAME}" != WebContentExtension && "${PRODUCT_NAME}" != WebContentCaptivePortalExtension ]]; then plistbuddy Add :com.apple.private.gpu-restricted bool YES plistbuddy Add :com.apple.private.pac.exception bool YES @@ -427,9 +406,6 @@ function ios_family_process_webcontent_captiveportal_entitlements() function ios_family_process_gpu_entitlements() { - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit - plistbuddy Add :com.apple.QuartzCore.secure-mode bool YES plistbuddy Add :com.apple.QuartzCore.webkit-end-points bool YES plistbuddy add :com.apple.QuartzCore.webkit-limited-types bool YES @@ -519,9 +495,6 @@ function ios_family_process_network_entitlements() plistbuddy Add :com.apple.private.tcc.manager.check-by-audit-token:0 string kTCCServiceWebKitIntelligentTrackingPrevention plistbuddy Add :com.apple.private.tcc.manager.check-by-audit-token:1 string kTCCServiceUserTracking - plistbuddy Add :com.apple.security.fatal-exceptions array - plistbuddy Add :com.apple.security.fatal-exceptions:0 string jit - plistbuddy Add :com.apple.private.appstored array plistbuddy Add :com.apple.private.appstored:0 string InstallWebAttribution diff --git a/Source/WebKit/Shared/AuxiliaryProcessExtensions/WebContentProcessExtension.entitlements b/Source/WebKit/Shared/AuxiliaryProcessExtensions/WebContentProcessExtension.entitlements index 59b822b247ca..2c16d20ddb57 100644 --- a/Source/WebKit/Shared/AuxiliaryProcessExtensions/WebContentProcessExtension.entitlements +++ b/Source/WebKit/Shared/AuxiliaryProcessExtensions/WebContentProcessExtension.entitlements @@ -10,9 +10,5 @@ com.apple.private.extensionkit.host-requirement-exemption - com.apple.security.fatal-exceptions - - jit -