Unreviewed, fix CLoop build

Constellation · Constellation · commit 4ef21755ac3f · 2021-09-27T08:55:04.000Z
https://bugs.webkit.org/show_bug.cgi?id=229223 * llint/LLIntOfflineAsmConfig.h: * llint/LowLevelInterpreter64.asm: Canonical link: https://commits.webkit.org/242161@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283103 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2021-09-27  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        Unreviewed, fix CLoop build
+        https://bugs.webkit.org/show_bug.cgi?id=229223
+
+        * llint/LLIntOfflineAsmConfig.h:
+        * llint/LowLevelInterpreter64.asm:
+
 2021-09-27  Saam Barati  <sbarati@apple.com>
 
         Build an unlinked baseline JIT
diff --git a/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h b/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
@@ -169,6 +169,12 @@
 
 #define OFFLINE_ASM_GIGACAGE_ENABLED GIGACAGE_ENABLED
 
+#if ENABLE(JIT)
+#define OFFLINE_ASM_JIT 1
+#else
+#define OFFLINE_ASM_JIT 0
+#endif
+
 #if ENABLE(WEBASSEMBLY)
 #define OFFLINE_ASM_WEBASSEMBLY 1
 #else
diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
@@ -440,19 +440,21 @@ macro checkSwitchToJITForLoop()
             move cfr, a0
             move PC, a1
             cCall2(_llint_loop_osr)
-            btpz r0, .recover
-            move r1, sp
-
-            # Baseline uses LLInt's PB register for its JIT constant pool.
-            loadp CodeBlock[cfr], PB
-            loadp CodeBlock::m_jitData[PB], PB
-            loadp CodeBlock::JITData::m_jitConstantPool[PB], PB
-
-            if ARM64E
-                leap JSCConfig + constexpr JSC::offsetOfJSCConfigGateMap + (constexpr Gate::loopOSREntry) * PtrSize, a2
-                jmp [a2], NativeToJITGatePtrTag # JSEntryPtrTag
-            else
-                jmp r0, JSEntryPtrTag
+            if not JIT
+                btpz r0, .recover
+                move r1, sp
+
+                # Baseline uses LLInt's PB register for its JIT constant pool.
+                loadp CodeBlock[cfr], PB
+                loadp CodeBlock::m_jitData[PB], PB
+                loadp CodeBlock::JITData::m_jitConstantPool[PB], PB
+
+                if ARM64E
+                    leap JSCConfig + constexpr JSC::offsetOfJSCConfigGateMap + (constexpr Gate::loopOSREntry) * PtrSize, a2
+                    jmp [a2], NativeToJITGatePtrTag # JSEntryPtrTag
+                else
+                    jmp r0, JSEntryPtrTag
+                end
             end
         .recover:
             loadPC()
