Changeset 237472 in webkit

Timestamp:

Oct 26, 2018, 11:51:25 AM (8 years ago)

Author:

Alan Coon

Message:

Cherry-pick r236606. rdar://problem/45285669

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

Not reviewed.

• assembler/LinkBuffer.cpp: (JSC::LinkBuffer::copyCompactAndLinkCode):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@236606 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-606-branch/Source/JavaScriptCore

Files:

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

branches/safari-606-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-10-23  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r236606. rdar://problem/45285669
+
+    Gardening: speculative build fix.
+    <rdar://problem/44869924>
+    
+    Not reviewed.
+    
+    * assembler/LinkBuffer.cpp:
+    (JSC::LinkBuffer::copyCompactAndLinkCode):
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236606 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-10-23  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-606-branch/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());
@@ -124 +124 @@
     unsigned jumpCount = jumpsToLink.size();
 
-#if CPU(ARM64E)
+#if CPU(ARM64E) && ENABLE(FAST_JIT_PERMISSIONS)
     os_thread_self_restrict_rwx_to_rw();
 #endif
@@ -141 +141 @@
             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);
@@ -194 +194 @@
         RELEASE_ASSERT(bytes % sizeof(InstructionType) == 0);
 
-#if CPU(ARM64E)
+#if CPU(ARM64E) && ENABLE(FAST_JIT_PERMISSIONS)
         unsigned index = readPtr;
 #endif
@@ -200 +200 @@
         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);
@@ -208 +208 @@
     }
 
-#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())));
@@ -219 +219 @@
         
     for (unsigned i = 0; i < jumpCount; ++i) {
-#if CPU(ARM64E)
+#if CPU(ARM64E) && ENABLE(FAST_JIT_PERMISSIONS)
         auto memcpyFunction = memcpy;
 #else
@@ -236 +236 @@
     }
 
-#if CPU(ARM64E)
+#if CPU(ARM64E) && ENABLE(FAST_JIT_PERMISSIONS)
     os_thread_self_restrict_rwx_to_rx();
 #endif
@@ -245 +245 @@
     }
 
-#if !CPU(ARM64E)
+#if !CPU(ARM64E) || !ENABLE(FAST_JIT_PERMISSIONS)
     ASSERT(codeOutData != outData);
     performJITMemcpy(codeOutData, outData, m_size);