Changeset 218093 in webkit

Timestamp:

Jun 12, 2017 4:51:58 AM (7 years ago)

Author:

Yusuke Suzuki

Message:

Unreviewed, build fix for ARM64
​https://bugs.webkit.org/show_bug.cgi?id=172421

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileArrayIndexOf):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGSpeculativeJIT.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-06-12  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Unreviewed, build fix for ARM64
+        https://bugs.webkit.org/show_bug.cgi?id=172421
+
+        * dfg/DFGSpeculativeJIT.cpp:
+        (JSC::DFG::SpeculativeJIT::compileArrayIndexOf):
+
 2017-06-09  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -7498 +7498 @@
         };
 
-#if USE(JSVALUE32_64)
         GPRTemporary temp(this);
         GPRReg tempGPR = temp.gpr();
-#endif
 
         if (searchElementEdge.useKind() == Int32Use) {
@@ -7516 +7514 @@
             emitLoop([&] () {
 #if USE(JSVALUE64)
-                auto found = m_jit.branch64(CCallHelpers::Equal, MacroAssembler::BaseIndex(storageGPR, indexGPR, MacroAssembler::TimesEight), searchElementGPR);
+                m_jit.load64(CCallHelpers::Equal, MacroAssembler::BaseIndex(storageGPR, indexGPR, MacroAssembler::TimesEight), tempGPR);
+                auto found = m_jit.branch64(CCallHelpers::Equal, tempGPR, searchElementGPR);
 #else
                 auto skip = m_jit.branch32(CCallHelpers::NotEqual, MacroAssembler::BaseIndex(storageGPR, indexGPR, MacroAssembler::TimesEight, TagOffset), TrustedImm32(JSValue::Int32Tag));
@@ -7533 +7532 @@
             emitLoop([&] () {
 #if USE(JSVALUE64)
-                auto found = m_jit.branch64(CCallHelpers::Equal, MacroAssembler::BaseIndex(storageGPR, indexGPR, MacroAssembler::TimesEight), searchElementGPR);
+                m_jit.load64(CCallHelpers::Equal, MacroAssembler::BaseIndex(storageGPR, indexGPR, MacroAssembler::TimesEight), tempGPR);
+                auto found = m_jit.branch64(CCallHelpers::Equal, tempGPR, searchElementGPR);
 #else
                 auto skip = m_jit.branch32(CCallHelpers::NotEqual, MacroAssembler::BaseIndex(storageGPR, indexGPR, MacroAssembler::TimesEight, TagOffset), TrustedImm32(JSValue::CellTag));