fix merge

oven-sh · Oct 4, 2023 · 2c4d07c · 2c4d07c
1 parent 0e4469f
commit 2c4d07c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/Source/JavaScriptCore/assembler/FastJITPermissions.h b/Source/JavaScriptCore/assembler/FastJITPermissions.h
@@ -34,10 +34,9 @@
 
 #include <wtf/Platform.h>
 
-#if CPU(ARM64)
 #if USE(INLINE_JIT_PERMISSIONS_API)
 #include <ServiceExtensions/SEMemory_Private.h>
-#elif USE(PTHREAD_JIT_PERMISSIONS_API)
+#elif CPU(ARM64)
 #include <pthread.h>
 #elif USE(APPLE_INTERNAL_SDK)
 #include <os/thread_self_restrict.h> 
@@ -47,10 +46,9 @@ static ALWAYS_INLINE void threadSelfRestrictRWXToRW()
 {
     ASSERT(g_jscConfig.useFastJITPermissions);
 
-#if CPU(ARM64)
 #if USE(INLINE_JIT_PERMISSIONS_API)
     se_memory_inline_jit_restrict_rwx_to_rw_with_witness();
-#elif USE(PTHREAD_JIT_PERMISSIONS_API)
+#elif CPU(ARM64)
     pthread_jit_write_protect_np(false);
 #elif USE(APPLE_INTERNAL_SDK)
     os_thread_self_restrict_rwx_to_rw();
@@ -65,10 +63,9 @@ static ALWAYS_INLINE void threadSelfRestrictRWXToRX()
 {
     ASSERT(g_jscConfig.useFastJITPermissions);
 
-#if CPU(ARM64)
 #if USE(INLINE_JIT_PERMISSIONS_API)
     se_memory_inline_jit_restrict_rwx_to_rx_with_witness();
-#elif USE(PTHREAD_JIT_PERMISSIONS_API)
+#elif CPU(ARM64)
     pthread_jit_write_protect_np(true);
 #elif USE(APPLE_INTERNAL_SDK)
     os_thread_self_restrict_rwx_to_rx();

diff --git a/Source/JavaScriptCore/jit/ExecutableAllocator.cpp b/Source/JavaScriptCore/jit/ExecutableAllocator.cpp
@@ -417,10 +417,11 @@ static ALWAYS_INLINE JITReservation initializeJITPageReservation()
 #if OS(DARWIN) && CPU(ARM64)
 #if USE(INLINE_JIT_PERMISSIONS_API)
         fastJITPermissionsIsSupported = !!se_memory_inline_jit_restrict_with_witness_supported();
-#elif USE(PTHREAD_JIT_PERMISSIONS_API)
+#elif CPU(ARM64)
         fastJITPermissionsIsSupported = !!pthread_jit_write_protect_supported_np();
 #elif USE(APPLE_INTERNAL_SDK)
         fastJITPermissionsIsSupported = !!os_thread_self_restrict_rwx_is_supported();
+#endif
 #endif
         g_jscConfig.useFastJITPermissions = fastJITPermissionsIsSupported;