Diff
Modified: tags/Safari-607.1.14.4/Source/_javascript_Core/ChangeLog (238585 => 238586)
--- tags/Safari-607.1.14.4/Source/_javascript_Core/ChangeLog 2018-11-28 00:15:01 UTC (rev 238585)
+++ tags/Safari-607.1.14.4/Source/_javascript_Core/ChangeLog 2018-11-28 00:20:00 UTC (rev 238586)
@@ -1,5 +1,9 @@
2018-11-27 Alan Coon <[email protected]>
+ Revert r238573. rdar://problem/45494310
+
+2018-11-27 Alan Coon <[email protected]>
+
Cherry-pick r238564. rdar://problem/45494310
Introducing a ENABLE_SEPARATED_WX_HEAP macro.
Modified: tags/Safari-607.1.14.4/Source/_javascript_Core/config.h (238585 => 238586)
--- tags/Safari-607.1.14.4/Source/_javascript_Core/config.h 2018-11-28 00:15:01 UTC (rev 238585)
+++ tags/Safari-607.1.14.4/Source/_javascript_Core/config.h 2018-11-28 00:20:00 UTC (rev 238586)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2013 Apple Inc. All rights reserved.
* Copyright (C) 2006 Samuel Weinig <[email protected]>
*
* This library is free software; you can redistribute it and/or
@@ -37,11 +37,3 @@
#endif
#include <wtf/DisallowCType.h>
-
-#if !defined(ENABLE_SEPARATED_WX_HEAP)
-#if (!ENABLE(FAST_JIT_PERMISSIONS) || !CPU(ARM64E)) && PLATFORM(IOS_FAMILY) && CPU(ARM64)
-#define ENABLE_SEPARATED_WX_HEAP 1
-#else
-#define ENABLE_SEPARATED_WX_HEAP 0
-#endif
-#endif // !defined(ENABLE_SEPARATED_WX_HEAP)
Modified: tags/Safari-607.1.14.4/Source/_javascript_Core/jit/ExecutableAllocator.cpp (238585 => 238586)
--- tags/Safari-607.1.14.4/Source/_javascript_Core/jit/ExecutableAllocator.cpp 2018-11-28 00:15:01 UTC (rev 238585)
+++ tags/Safari-607.1.14.4/Source/_javascript_Core/jit/ExecutableAllocator.cpp 2018-11-28 00:20:00 UTC (rev 238586)
@@ -104,7 +104,7 @@
static const double executablePoolReservationFraction = 0.25;
#endif
-#if ENABLE(SEPARATED_WX_HEAP)
+#if !ENABLE(FAST_JIT_PERMISSIONS) || !CPU(ARM64E)
JS_EXPORT_PRIVATE bool useFastPermisionsJITCopy { false };
JS_EXPORT_PRIVATE JITWriteSeparateHeapsFunction jitWriteSeparateHeapsFunction;
#endif
@@ -154,11 +154,11 @@
ASSERT(m_reservation.size() == reservationSize);
void* reservationBase = m_reservation.base();
-#if ENABLE(FAST_JIT_PERMISSIONS) && !ENABLE(SEPARATED_WX_HEAP)
+#if ENABLE(FAST_JIT_PERMISSIONS) && CPU(ARM64E)
RELEASE_ASSERT(os_thread_self_restrict_rwx_is_supported());
os_thread_self_restrict_rwx_to_rx();
-#else // not ENABLE(FAST_JIT_PERMISSIONS) or ENABLE(SEPARATED_WX_HEAP)
+#else // not ENABLE(FAST_JIT_PERMISSIONS) or not CPU(ARM64E)
#if ENABLE(FAST_JIT_PERMISSIONS)
if (os_thread_self_restrict_rwx_is_supported()) {
useFastPermisionsJITCopy = true;
@@ -172,7 +172,7 @@
reservationSize -= pageSize();
initializeSeparatedWXHeaps(m_reservation.base(), pageSize(), reservationBase, reservationSize);
}
-#endif // not ENABLE(FAST_JIT_PERMISSIONS) or ENABLE(SEPARATED_WX_HEAP)
+#endif // not ENABLE(FAST_JIT_PERMISSIONS) or not CPU(ARM64E)
addFreshFreeSpace(reservationBase, reservationSize);
@@ -266,7 +266,7 @@
// Zero out writableAddr to avoid leaking the address of the writable mapping.
memset_s(&writableAddr, sizeof(writableAddr), 0, sizeof(writableAddr));
-#if ENABLE(SEPARATED_WX_HEAP)
+#if !ENABLE(FAST_JIT_PERMISSIONS) || !CPU(ARM64E)
jitWriteSeparateHeapsFunction = reinterpret_cast<JITWriteSeparateHeapsFunction>(writeThunk.code().executableAddress());
#endif
}
Modified: tags/Safari-607.1.14.4/Source/_javascript_Core/jit/ExecutableAllocator.h (238585 => 238586)
--- tags/Safari-607.1.14.4/Source/_javascript_Core/jit/ExecutableAllocator.h 2018-11-28 00:15:01 UTC (rev 238585)
+++ tags/Safari-607.1.14.4/Source/_javascript_Core/jit/ExecutableAllocator.h 2018-11-28 00:20:00 UTC (rev 238586)
@@ -78,13 +78,13 @@
JS_EXPORT_PRIVATE bool isJITPC(void* pc);
-#if ENABLE(SEPARATED_WX_HEAP)
+#if !ENABLE(FAST_JIT_PERMISSIONS) || !CPU(ARM64E)
typedef void (*JITWriteSeparateHeapsFunction)(off_t, const void*, size_t);
extern JS_EXPORT_PRIVATE JITWriteSeparateHeapsFunction jitWriteSeparateHeapsFunction;
extern JS_EXPORT_PRIVATE bool useFastPermisionsJITCopy;
-#endif // ENABLE(SEPARATED_WX_HEAP)
+#endif // !ENABLE(FAST_JIT_PERMISSIONS) || !CPU(ARM64E)
static inline void* performJITMemcpy(void *dst, const void *src, size_t n)
{
@@ -96,7 +96,7 @@
if (isJITPC(dst)) {
RELEASE_ASSERT(reinterpret_cast<uint8_t*>(dst) + n <= endOfFixedExecutableMemoryPool());
#if ENABLE(FAST_JIT_PERMISSIONS)
-#if ENABLE(SEPARATED_WX_HEAP)
+#if !CPU(ARM64E)
if (useFastPermisionsJITCopy)
#endif
{
@@ -107,7 +107,7 @@
}
#endif // ENABLE(FAST_JIT_PERMISSIONS)
-#if ENABLE(SEPARATED_WX_HEAP)
+#if !ENABLE(FAST_JIT_PERMISSIONS) || !CPU(ARM64E)
if (jitWriteSeparateHeapsFunction) {
// Use execute-only write thunk for writes inside the JIT region. This is a variant of
// memcpy that takes an offset into the JIT region as its destination (first) parameter.
Modified: tags/Safari-607.1.14.4/Source/_javascript_Core/runtime/Options.cpp (238585 => 238586)
--- tags/Safari-607.1.14.4/Source/_javascript_Core/runtime/Options.cpp 2018-11-28 00:15:01 UTC (rev 238585)
+++ tags/Safari-607.1.14.4/Source/_javascript_Core/runtime/Options.cpp 2018-11-28 00:20:00 UTC (rev 238586)
@@ -468,7 +468,7 @@
Options::useOSREntryToFTL() = false;
}
-#if ENABLE(SEPARATED_WX_HEAP)
+#if PLATFORM(IOS_FAMILY) && CPU(ARM64) && !CPU(ARM64E)
// Override globally for now. Longer term we'll just make the default
// be to have this option enabled, and have platforms that don't support
// it just silently use a single mapping.
