[webkit-changes] [218094] trunk/Source/JavaScriptCore

[commit-queue]

Title: [218094] trunk/Source/_javascript_Core

Revision

218094

Author

commit-qu...@webkit.org

Date

2017-06-12 05:17:00 -0700 (Mon, 12 Jun 2017)

Log Message

Unreviewed, rolling out r218093.
https://bugs.webkit.org/show_bug.cgi?id=173259

Break builds (Requested by yusukesuzuki on #webkit).

Reverted changeset:

"Unreviewed, build fix for ARM64"
https://bugs.webkit.org/show_bug.cgi?id=172421
http://trac.webkit.org/changeset/218093

Modified Paths

• trunk/Source/_javascript_Core/ChangeLog
• trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (218093 => 218094)

--- trunk/Source/_javascript_Core/ChangeLog	2017-06-12 11:51:58 UTC (rev 218093)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-06-12 12:17:00 UTC (rev 218094)
@@ -1,3 +1,16 @@
+2017-06-12  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, rolling out r218093.
+        https://bugs.webkit.org/show_bug.cgi?id=173259
+
+        Break builds (Requested by yusukesuzuki on #webkit).
+
+        Reverted changeset:
+
+        "Unreviewed, build fix for ARM64"
+        https://bugs.webkit.org/show_bug.cgi?id=172421
+        http://trac.webkit.org/changeset/218093
+
 2017-06-12  Yusuke Suzuki  <utatane....@gmail.com>
 
         Unreviewed, build fix for ARM64

Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (218093 => 218094)

--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2017-06-12 11:51:58 UTC (rev 218093)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2017-06-12 12:17:00 UTC (rev 218094)
@@ -7497,8 +7497,10 @@
             int32Result(indexGPR, node);
         };
 
+#if USE(JSVALUE32_64)
         GPRTemporary temp(this);
         GPRReg tempGPR = temp.gpr();
+#endif
 
         if (searchElementEdge.useKind() == Int32Use) {
             ASSERT(node->arrayMode().type() == Array::Int32);
@@ -7513,8 +7515,7 @@
 #endif
             emitLoop([&] () {
 #if USE(JSVALUE64)
-                m_jit.load64(CCallHelpers::Equal, MacroAssembler::BaseIndex(storageGPR, indexGPR, MacroAssembler::TimesEight), tempGPR);
-                auto found = m_jit.branch64(CCallHelpers::Equal, tempGPR, searchElementGPR);
+                auto found = m_jit.branch64(CCallHelpers::Equal, MacroAssembler::BaseIndex(storageGPR, indexGPR, MacroAssembler::TimesEight), searchElementGPR);
 #else
                 auto skip = m_jit.branch32(CCallHelpers::NotEqual, MacroAssembler::BaseIndex(storageGPR, indexGPR, MacroAssembler::TimesEight, TagOffset), TrustedImm32(JSValue::Int32Tag));
                 m_jit.load32(MacroAssembler::BaseIndex(storageGPR, indexGPR, MacroAssembler::TimesEight, PayloadOffset), tempGPR);
@@ -7531,8 +7532,7 @@
 
             emitLoop([&] () {
 #if USE(JSVALUE64)
-                m_jit.load64(CCallHelpers::Equal, MacroAssembler::BaseIndex(storageGPR, indexGPR, MacroAssembler::TimesEight), tempGPR);
-                auto found = m_jit.branch64(CCallHelpers::Equal, tempGPR, searchElementGPR);
+                auto found = m_jit.branch64(CCallHelpers::Equal, MacroAssembler::BaseIndex(storageGPR, indexGPR, MacroAssembler::TimesEight), searchElementGPR);
 #else
                 auto skip = m_jit.branch32(CCallHelpers::NotEqual, MacroAssembler::BaseIndex(storageGPR, indexGPR, MacroAssembler::TimesEight, TagOffset), TrustedImm32(JSValue::CellTag));
                 m_jit.load32(MacroAssembler::BaseIndex(storageGPR, indexGPR, MacroAssembler::TimesEight, PayloadOffset), tempGPR);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes