36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
diff --git a/Source/JavaScriptCore/assembler/LinkBuffer.cpp b/Source/JavaScriptCore/assembler/LinkBuffer.cpp
|
|
index b6577a9e8c4e..7745793670b1 100644
|
|
--- a/Source/JavaScriptCore/assembler/LinkBuffer.cpp
|
|
+++ b/Source/JavaScriptCore/assembler/LinkBuffer.cpp
|
|
@@ -374,6 +374,7 @@ void LinkBuffer::copyCompactAndLinkCode(MacroAssembler& macroAssembler, JITCompi
|
|
m_executableMemory->shrink(m_size);
|
|
}
|
|
|
|
+#if ENABLE(JIT)
|
|
if (useFastJITPermissions()) {
|
|
ASSERT(codeOutData == outData);
|
|
if (UNLIKELY(Options::dumpJITMemoryPath()))
|
|
@@ -382,6 +383,10 @@ void LinkBuffer::copyCompactAndLinkCode(MacroAssembler& macroAssembler, JITCompi
|
|
ASSERT(codeOutData != outData);
|
|
performJITMemcpy(codeOutData, outData, m_size);
|
|
}
|
|
+#else
|
|
+ ASSERT(codeOutData != outData);
|
|
+ performJITMemcpy(codeOutData, outData, m_size);
|
|
+#endif
|
|
|
|
jumpsToLink.clear();
|
|
|
|
diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h
|
|
index 700f90adc6c3..f703d4239bc0 100644
|
|
--- a/Source/WTF/wtf/PlatformEnable.h
|
|
+++ b/Source/WTF/wtf/PlatformEnable.h
|
|
@@ -871,6 +871,6 @@
|
|
#error "ENABLE(WEBGL2) requires ENABLE(WEBGL)"
|
|
#endif
|
|
|
|
-#if CPU(ARM64) && CPU(ADDRESS64)
|
|
+#if CPU(ARM64) && CPU(ADDRESS64) && ENABLE(JIT)
|
|
#define USE_JUMP_ISLANDS 1
|
|
#endif
|