Title: [236224] trunk/Source/_javascript_Core
Revision
236224
Author
[email protected]
Date
2018-09-19 14:09:14 -0700 (Wed, 19 Sep 2018)

Log Message

CheckStructureOrEmpty should pass in a tempGPR to emitStructureCheck since it may jump over that code
https://bugs.webkit.org/show_bug.cgi?id=189703

Reviewed by Mark Lam.

This fixes a crash that a TypeProfiler change revealed.

* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (236223 => 236224)


--- trunk/Source/_javascript_Core/ChangeLog	2018-09-19 21:00:08 UTC (rev 236223)
+++ trunk/Source/_javascript_Core/ChangeLog	2018-09-19 21:09:14 UTC (rev 236224)
@@ -1,5 +1,17 @@
 2018-09-19  Saam barati  <[email protected]>
 
+        CheckStructureOrEmpty should pass in a tempGPR to emitStructureCheck since it may jump over that code
+        https://bugs.webkit.org/show_bug.cgi?id=189703
+
+        Reviewed by Mark Lam.
+
+        This fixes a crash that a TypeProfiler change revealed.
+
+        * dfg/DFGSpeculativeJIT64.cpp:
+        (JSC::DFG::SpeculativeJIT::compile):
+
+2018-09-19  Saam barati  <[email protected]>
+
         AI rule for MultiPutByOffset executes its effects in the wrong order
         https://bugs.webkit.org/show_bug.cgi?id=189757
         <rdar://problem/43535257>

Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp (236223 => 236224)


--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp	2018-09-19 21:00:08 UTC (rev 236223)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp	2018-09-19 21:09:14 UTC (rev 236224)
@@ -3552,11 +3552,19 @@
     case CheckStructureOrEmpty: {
         SpeculateCellOperand cell(this, node->child1());
         GPRReg cellGPR = cell.gpr();
+
+        GPRReg tempGPR = InvalidGPRReg;
+        std::optional<GPRTemporary> temp;
+        if (node->structureSet().size() > 1) {
+            temp.emplace(this);
+            tempGPR = temp->gpr();
+        }
+
         MacroAssembler::Jump isEmpty;
         if (m_interpreter.forNode(node->child1()).m_type & SpecEmpty)
             isEmpty = m_jit.branchIfEmpty(cellGPR);
 
-        emitStructureCheck(node, cellGPR, InvalidGPRReg);
+        emitStructureCheck(node, cellGPR, tempGPR);
 
         if (isEmpty.isSet())
             isEmpty.link(&m_jit);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to