Changeset 270052 in webkit

Timestamp:

Nov 19, 2020 3:08:56 PM (3 years ago)

Author:

sbarati@apple.com

Message:

Use os_thread_self_restrict_rwx_is_supported instead of pthread_jit_write_protect_supported_np on Apple Internal SDK builds
​https://bugs.webkit.org/show_bug.cgi?id=219099
<rdar://problem/71547048>

Reviewed by Mark Lam.

Source/JavaScriptCore:

• assembler/FastJITPermissions.h:

(useFastJITPermissions):
(threadSelfRestrictRWXToRW):
(threadSelfRestrictRWXToRX):

Source/WTF:

• wtf/PlatformHave.h:
• wtf/PlatformUse.h:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/assembler/FastJITPermissions.h (modified) (4 diffs)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WTF/wtf/PlatformUse.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-11-19  Saam Barati  <sbarati@apple.com>
+
+        Use os_thread_self_restrict_rwx_is_supported instead of pthread_jit_write_protect_supported_np on Apple Internal SDK builds
+        https://bugs.webkit.org/show_bug.cgi?id=219099
+        <rdar://problem/71547048>
+
+        Reviewed by Mark Lam.
+
+        * assembler/FastJITPermissions.h:
+        (useFastJITPermissions):
+        (threadSelfRestrictRWXToRW):
+        (threadSelfRestrictRWXToRX):
+
 2020-11-19  Xan López  <xan@igalia.com>
 

trunk/Source/JavaScriptCore/assembler/FastJITPermissions.h

@@ -30 +30 @@
 #include <wtf/Platform.h>
 
-#if HAVE(PTHREAD_JIT_PERMISSIONS_API)
+#if USE(PTHREAD_JIT_PERMISSIONS_API)
 #include <pthread.h>
 #elif USE(APPLE_INTERNAL_SDK)
@@ -40 +40 @@
 #if CPU(ARM64E)
     return true;
-#elif HAVE(PTHREAD_JIT_PERMISSIONS_API) 
+#elif USE(PTHREAD_JIT_PERMISSIONS_API) 
     return !!pthread_jit_write_protect_supported_np();
 #elif USE(APPLE_INTERNAL_SDK)
@@ -53 +53 @@
     ASSERT(useFastJITPermissions());
 
-#if HAVE(PTHREAD_JIT_PERMISSIONS_API) 
+#if USE(PTHREAD_JIT_PERMISSIONS_API) 
     pthread_jit_write_protect_np(false);
 #elif USE(APPLE_INTERNAL_SDK)
@@ -68 +68 @@
     ASSERT(useFastJITPermissions());
 
-#if HAVE(PTHREAD_JIT_PERMISSIONS_API) 
+#if USE(PTHREAD_JIT_PERMISSIONS_API) 
     pthread_jit_write_protect_np(true);
 #elif USE(APPLE_INTERNAL_SDK)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-11-19  Saam Barati  <sbarati@apple.com>
+
+        Use os_thread_self_restrict_rwx_is_supported instead of pthread_jit_write_protect_supported_np on Apple Internal SDK builds
+        https://bugs.webkit.org/show_bug.cgi?id=219099
+        <rdar://problem/71547048>
+
+        Reviewed by Mark Lam.
+
+        * wtf/PlatformHave.h:
+        * wtf/PlatformUse.h:
+
 2020-11-18  Yousuke Kimoto  <Yousuke.Kimoto@sony.com>
 

trunk/Source/WTF/wtf/PlatformHave.h

@@ -701 +701 @@
 #define HAVE_LSDATABASECONTEXT 1
 #define HAVE_PRECONNECT_PING 1
-#define HAVE_PTHREAD_JIT_PERMISSIONS_API 1
 #define HAVE_WEBP 1
 #endif

trunk/Source/WTF/wtf/PlatformUse.h

@@ -317 +317 @@
 #define USE_JUMP_ISLANDS 1
 #endif
+
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
+    || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
+#if USE(APPLE_INTERNAL_SDK)
+/* Always use the macro on internal builds */
+#define USE_PTHREAD_JIT_PERMISSIONS_API 0 
+#else
+#define USE_PTHREAD_JIT_PERMISSIONS_API 1
+#endif
+#endif