Changeset 236606 in webkit

Timestamp:

Sep 28, 2018, 11:46:52 AM (8 years ago)

Author:

mark.lam@apple.com

Message:

Gardening: speculative build fix.
<rdar://problem/44869924>

Not reviewed.

• assembler/LinkBuffer.cpp:

(JSC::LinkBuffer::copyCompactAndLinkCode):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/LinkBuffer.cpp (modified) (9 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-09-28  Mark Lam  <mark.lam@apple.com>
+
+        Gardening: speculative build fix.
+        <rdar://problem/44869924>
+
+        Not reviewed.
+
+        * assembler/LinkBuffer.cpp:
+        (JSC::LinkBuffer::copyCompactAndLinkCode):
+
 2018-09-28  Guillaume Emont  <guijemont@igalia.com>
 

trunk/Source/JavaScriptCore/assembler/LinkBuffer.cpp

@@ -111 +111 @@
 
     uint8_t* codeOutData = m_code.dataLocation<uint8_t*>();
-#if CPU(ARM64E)
+#if CPU(ARM64E) && ENABLE(FAST_JIT_PERMISSIONS)
     const ARM64EHash assemblerBufferHash = macroAssembler.m_assembler.buffer().hash();
     ARM64EHash verifyUncompactedHash(assemblerBufferHash.randomSeed());
@@ -128 +128 @@
     unsigned jumpCount = jumpsToLink.size();
 
-#if CPU(ARM64E)
+#if CPU(ARM64E) && ENABLE(FAST_JIT_PERMISSIONS)
     os_thread_self_restrict_rwx_to_rw();
 #endif
@@ -145 +145 @@
             ASSERT(!(readPtr % 2));
             ASSERT(!(writePtr % 2));
-#if CPU(ARM64E)
+#if CPU(ARM64E) && ENABLE(FAST_JIT_PERMISSIONS)
             unsigned index = readPtr;
 #endif
             while (copySource != copyEnd) {
                 InstructionType insn = *copySource++;
-#if CPU(ARM64E)
+#if CPU(ARM64E) && ENABLE(FAST_JIT_PERMISSIONS)
                 static_assert(sizeof(InstructionType) == 4, "");
                 verifyUncompactedHash.update(insn, index);
@@ -198 +198 @@
         RELEASE_ASSERT(bytes % sizeof(InstructionType) == 0);
 
-#if CPU(ARM64E)
+#if CPU(ARM64E) && ENABLE(FAST_JIT_PERMISSIONS)
         unsigned index = readPtr;
 #endif
@@ -204 +204 @@
         for (size_t i = 0; i < bytes; i += sizeof(InstructionType)) {
             InstructionType insn = *src++;
-#if CPU(ARM64E)
+#if CPU(ARM64E) && ENABLE(FAST_JIT_PERMISSIONS)
             verifyUncompactedHash.update(insn, index);
             index += sizeof(InstructionType);
@@ -212 +212 @@
     }
 
-#if CPU(ARM64E)
+#if CPU(ARM64E) && ENABLE(FAST_JIT_PERMISSIONS)
     if (verifyUncompactedHash.hash() != assemblerBufferHash.hash()) {
         dataLogLn("Hashes don't match: ", RawPointer(bitwise_cast<void*>(verifyUncompactedHash.hash())), " ", RawPointer(bitwise_cast<void*>(assemblerBufferHash.hash())));
@@ -223 +223 @@
         
     for (unsigned i = 0; i < jumpCount; ++i) {
-#if CPU(ARM64E)
+#if CPU(ARM64E) && ENABLE(FAST_JIT_PERMISSIONS)
         auto memcpyFunction = memcpy;
 #else
@@ -240 +240 @@
     }
 
-#if CPU(ARM64E)
+#if CPU(ARM64E) && ENABLE(FAST_JIT_PERMISSIONS)
     os_thread_self_restrict_rwx_to_rx();
 #endif
@@ -249 +249 @@
     }
 
-#if !CPU(ARM64E)
+#if !CPU(ARM64E) || !ENABLE(FAST_JIT_PERMISSIONS)
     ASSERT(codeOutData != outData);
     performJITMemcpy(codeOutData, outData, m_size);