Title: [197799] trunk/Source/_javascript_Core
- Revision
- 197799
- Author
- [email protected]
- Date
- 2016-03-08 13:36:41 -0800 (Tue, 08 Mar 2016)
Log Message
arm64 build fix after r197793.
* jit/ExecutableAllocatorFixedVMPool.cpp:
(JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator):
(JSC::FixedVMPoolExecutableAllocator::initializeBulletproofJIT):
(JSC::FixedVMPoolExecutableAllocator::jitWriteThunkGenerator):
Use consistent ENABLE macro. It looks like it was partially renamed.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (197798 => 197799)
--- trunk/Source/_javascript_Core/ChangeLog 2016-03-08 21:33:01 UTC (rev 197798)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-03-08 21:36:41 UTC (rev 197799)
@@ -1,3 +1,13 @@
+2016-03-08 Alex Christensen <[email protected]>
+
+ arm64 build fix after r197793.
+
+ * jit/ExecutableAllocatorFixedVMPool.cpp:
+ (JSC::FixedVMPoolExecutableAllocator::FixedVMPoolExecutableAllocator):
+ (JSC::FixedVMPoolExecutableAllocator::initializeBulletproofJIT):
+ (JSC::FixedVMPoolExecutableAllocator::jitWriteThunkGenerator):
+ Use consistent ENABLE macro. It looks like it was partially renamed.
+
2016-03-08 Filip Pizlo <[email protected]>
Regexp matching should incur less call overhead
Modified: trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp (197798 => 197799)
--- trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp 2016-03-08 21:33:01 UTC (rev 197798)
+++ trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp 2016-03-08 21:36:41 UTC (rev 197799)
@@ -48,7 +48,7 @@
#include <stdio.h>
#endif
-#if ENABLE(SEPARATE_WX_HEAPPROOF_JIT)
+#if ENABLE(SEPARATED_WX_HEAP)
#include "LinkBuffer.h"
#include "MacroAssembler.h"
@@ -66,7 +66,7 @@
JS_EXPORT_PRIVATE uintptr_t startOfFixedExecutableMemoryPool;
JS_EXPORT_PRIVATE uintptr_t endOfFixedExecutableMemoryPool;
-#if ENABLE(SEPARATE_WX_HEAPPROOF_JIT)
+#if ENABLE(SEPARATED_WX_HEAP)
JS_EXPORT_PRIVATE uintptr_t jitWriteFunctionAddress;
#endif
@@ -87,7 +87,7 @@
ASSERT(m_reservation.size() == reservationSize);
void* reservationBase = m_reservation.base();
-#if ENABLE(SEPARATE_WX_HEAPPROOF_JIT)
+#if ENABLE(SEPARATED_WX_HEAP)
if (Options::useBulletproofJIT()) {
// First page of our JIT allocation is reserved.
ASSERT(reservationSize >= pageSize() * 2);
@@ -141,7 +141,7 @@
}
private:
-#if ENABLE(SEPARATE_WX_HEAPPROOF_JIT)
+#if ENABLE(SEPARATED_WX_HEAP)
void initializeBulletproofJIT(void* stubBase, size_t stubSize, void* jitBase, size_t jitSize)
{
mach_vm_address_t writableAddr = 0;
@@ -245,7 +245,7 @@
return FINALIZE_CODE(linkBuffer, ("Bulletproof JIT write thunk"));
}
#endif // CPU(ARM64)
-#endif // ENABLE(SEPARATE_WX_HEAPPROOF_JIT)
+#endif // ENABLE(SEPARATED_WX_HEAP)
private:
PageReservation m_reservation;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
