Changeset 197799 in webkit

Timestamp:

Mar 8, 2016, 1:36:41 PM (11 years ago)

Author:

achristensen@apple.com

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.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/ExecutableAllocatorFixedVMPool.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-03-08  Alex Christensen  <achristensen@webkit.org>
+
+        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  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp

@@ -49 +49 @@
 #endif
 
-#if ENABLE(SEPARATE_WX_HEAPPROOF_JIT)
+#if ENABLE(SEPARATED_WX_HEAP)
 #include "LinkBuffer.h"
 #include "MacroAssembler.h"
@@ -67 +67 @@
 JS_EXPORT_PRIVATE uintptr_t endOfFixedExecutableMemoryPool;
 
-#if ENABLE(SEPARATE_WX_HEAPPROOF_JIT)
+#if ENABLE(SEPARATED_WX_HEAP)
 JS_EXPORT_PRIVATE uintptr_t jitWriteFunctionAddress;
 #endif
@@ -88 +88 @@
             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.
@@ -142 +142 @@
 
 private:
-#if ENABLE(SEPARATE_WX_HEAPPROOF_JIT)
+#if ENABLE(SEPARATED_WX_HEAP)
     void initializeBulletproofJIT(void* stubBase, size_t stubSize, void* jitBase, size_t jitSize)
     {
@@ -246 +246 @@
     }
 #endif // CPU(ARM64)
-#endif // ENABLE(SEPARATE_WX_HEAPPROOF_JIT)
+#endif // ENABLE(SEPARATED_WX_HEAP)
 
 private: