<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193781] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193781">193781</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-12-08 13:44:12 -0800 (Tue, 08 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Polymorphic operand types for DFG and FTL div.
https://bugs.webkit.org/show_bug.cgi?id=151747
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Perf on benchmarks is neutral. The new JSRegress ftl-object-div test shows
a speed up not from the div operator itself, but from the fact that the
polymorphic operand types support now allow the test function to run without OSR
exiting, thereby realizing the DFG and FTL's speed up on other work that the test
function does.
This patch has passed the layout tests on x86_64 with a debug build.
It passed the JSC tests with x86 and x86_64 debug builds.
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* dfg/DFGClobberize.h:
(JSC::DFG::clobberize):
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::fixupNode):
* dfg/DFGOperations.cpp:
* dfg/DFGOperations.h:
* dfg/DFGPredictionPropagationPhase.cpp:
(JSC::DFG::PredictionPropagationPhase::propagate):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileArithDiv):
* ftl/FTLCompileBinaryOp.cpp:
(JSC::FTL::generateBinaryArithOpFastPath):
(JSC::FTL::generateBinaryOpFastPath):
* ftl/FTLInlineCacheDescriptor.h:
* ftl/FTLInlineCacheDescriptorInlines.h:
(JSC::FTL::ArithDivDescriptor::ArithDivDescriptor):
(JSC::FTL::ArithDivDescriptor::icSize):
* ftl/FTLInlineCacheSize.cpp:
(JSC::FTL::sizeOfArithDiv):
* ftl/FTLInlineCacheSize.h:
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::lower):
(JSC::FTL::DFG::LowerDFGToLLVM::compileArithMul):
- Fixed a cut-paste bug where the op_mul IC was using the op_sub IC size.
This bug is benign because the op_sub IC size turns out to be larger
than op_mul needs.
(JSC::FTL::DFG::LowerDFGToLLVM::compileArithDiv):
* jit/JITArithmetic.cpp:
(JSC::JIT::emit_op_div):
- Fixed a bug where the scratchFPR was not allocated for the 64bit port.
This bug is benign because the scratchFPR is only needed if we are
using scratchGPR register (used for branchConvertDoubleToInt32()) is
>= X86Registers::<a href="http://trac.webkit.org/projects/webkit/changeset/8">r8</a>. Since we're always using regT2 for the scratchT2,
the scratchFPR is never needed. However, we should fix this anyway to
be correct.
* tests/stress/op_div.js:
- Fixed some test values.
LayoutTests:
* js/regress/ftl-object-div-expected.txt: Added.
* js/regress/ftl-object-div.html: Added.
* js/regress/script-tests/ftl-object-div.js: Added.
(o1.valueOf):
(foo):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGClobberizeh">trunk/Source/JavaScriptCore/dfg/DFGClobberize.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFixupPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOperationscpp">trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOperationsh">trunk/Source/JavaScriptCore/dfg/DFGOperations.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPredictionPropagationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCompileBinaryOpcpp">trunk/Source/JavaScriptCore/ftl/FTLCompileBinaryOp.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLInlineCacheDescriptorh">trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLInlineCacheDescriptorInlinesh">trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptorInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLInlineCacheSizecpp">trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLInlineCacheSizeh">trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITArithmeticcpp">trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressop_divjs">trunk/Source/JavaScriptCore/tests/stress/op_div.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregressftlobjectdivexpectedtxt">trunk/LayoutTests/js/regress/ftl-object-div-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressftlobjectdivhtml">trunk/LayoutTests/js/regress/ftl-object-div.html</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsftlobjectdivjs">trunk/LayoutTests/js/regress/script-tests/ftl-object-div.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/LayoutTests/ChangeLog 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-12-08 Mark Lam <mark.lam@apple.com>
+
+ Polymorphic operand types for DFG and FTL div.
+ https://bugs.webkit.org/show_bug.cgi?id=151747
+
+ Reviewed by Geoffrey Garen.
+
+ * js/regress/ftl-object-div-expected.txt: Added.
+ * js/regress/ftl-object-div.html: Added.
+ * js/regress/script-tests/ftl-object-div.js: Added.
+ (o1.valueOf):
+ (foo):
+
</ins><span class="cx"> 2015-12-08 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not insert positioned renderers to multiple gPositionedDescendantsMap.
</span></span></pre></div>
<a id="trunkLayoutTestsjsregressftlobjectdivexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/ftl-object-div-expected.txt (0 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/ftl-object-div-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/ftl-object-div-expected.txt 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/ftl-object-div
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressftlobjectdivhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/ftl-object-div.html (0 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/ftl-object-div.html (rev 0)
+++ trunk/LayoutTests/js/regress/ftl-object-div.html 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="../../resources/regress-pre.js"></script>
+<script src="script-tests/ftl-object-div.js"></script>
+<script src="../../resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsftlobjectdivjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/ftl-object-div.js (0 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/ftl-object-div.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/ftl-object-div.js 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+//@ runFTLNoCJIT
+var o1 = {
+ i: 0,
+ valueOf: function() { return this.i; }
+};
+
+result = 0;
+function foo(a, b) {
+ var result = 0;
+ for (var j = 0; j < 10; j++) {
+ var temp;
+ if (a > b)
+ temp = a / b;
+ else
+ temp = b / 1;
+ temp = temp | 0;
+ result += temp;
+ }
+ for (var i = 0; i < 1000; i++)
+ result += i;
+ return result;
+}
+noInline(foo);
+
+var iterations;
+var expectedResult;
+if (this.window) {
+ // The layout test doesn't like too many iterations and may time out.
+ iterations = 10000;
+ expectedResult = 5045480390;
+} else {
+ iterations = 100000;
+ expectedResult = 54950300390;
+}
+
+
+for (var i = 0; i <= iterations; i++) {
+ o1.i = i + 2;
+ result += foo(o1, 10);
+}
+
+if (result != expectedResult)
+ throw "Bad result: " + result;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -1,3 +1,66 @@
</span><ins>+2015-12-08 Mark Lam <mark.lam@apple.com>
+
+ Polymorphic operand types for DFG and FTL div.
+ https://bugs.webkit.org/show_bug.cgi?id=151747
+
+ Reviewed by Geoffrey Garen.
+
+ Perf on benchmarks is neutral. The new JSRegress ftl-object-div test shows
+ a speed up not from the div operator itself, but from the fact that the
+ polymorphic operand types support now allow the test function to run without OSR
+ exiting, thereby realizing the DFG and FTL's speed up on other work that the test
+ function does.
+
+ This patch has passed the layout tests on x86_64 with a debug build.
+ It passed the JSC tests with x86 and x86_64 debug builds.
+
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * dfg/DFGClobberize.h:
+ (JSC::DFG::clobberize):
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+ * dfg/DFGOperations.cpp:
+ * dfg/DFGOperations.h:
+ * dfg/DFGPredictionPropagationPhase.cpp:
+ (JSC::DFG::PredictionPropagationPhase::propagate):
+
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileArithDiv):
+
+ * ftl/FTLCompileBinaryOp.cpp:
+ (JSC::FTL::generateBinaryArithOpFastPath):
+ (JSC::FTL::generateBinaryOpFastPath):
+
+ * ftl/FTLInlineCacheDescriptor.h:
+ * ftl/FTLInlineCacheDescriptorInlines.h:
+ (JSC::FTL::ArithDivDescriptor::ArithDivDescriptor):
+ (JSC::FTL::ArithDivDescriptor::icSize):
+
+ * ftl/FTLInlineCacheSize.cpp:
+ (JSC::FTL::sizeOfArithDiv):
+ * ftl/FTLInlineCacheSize.h:
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::lower):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileArithMul):
+ - Fixed a cut-paste bug where the op_mul IC was using the op_sub IC size.
+ This bug is benign because the op_sub IC size turns out to be larger
+ than op_mul needs.
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileArithDiv):
+
+ * jit/JITArithmetic.cpp:
+ (JSC::JIT::emit_op_div):
+ - Fixed a bug where the scratchFPR was not allocated for the 64bit port.
+ This bug is benign because the scratchFPR is only needed if we are
+ using scratchGPR register (used for branchConvertDoubleToInt32()) is
+ >= X86Registers::r8. Since we're always using regT2 for the scratchT2,
+ the scratchFPR is never needed. However, we should fix this anyway to
+ be correct.
+
+ * tests/stress/op_div.js:
+ - Fixed some test values.
+
</ins><span class="cx"> 2015-12-05 Aleksandr Skachkov <gskachkov@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] "super" and "this" should be lexically bound inside an arrow function and should live in a JSLexicalEnvironment
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -673,6 +673,10 @@
</span><span class="cx"> typeOfDoubleQuotient(
</span><span class="cx"> forNode(node->child1()).m_type, forNode(node->child2()).m_type));
</span><span class="cx"> break;
</span><ins>+ case UntypedUse:
+ clobberWorld(node->origin.semantic, clobberLimit);
+ forNode(node).setType(m_graph, SpecBytecodeNumber);
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGClobberizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGClobberize.h (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -247,15 +247,15 @@
</span><span class="cx">
</span><span class="cx"> case ArithAdd:
</span><span class="cx"> case ArithNegate:
</span><del>- case ArithDiv:
</del><span class="cx"> case ArithMod:
</span><span class="cx"> case DoubleAsInt32:
</span><span class="cx"> case UInt32ToNumber:
</span><span class="cx"> def(PureValue(node, node->arithMode()));
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ case ArithDiv:
+ case ArithMul:
</ins><span class="cx"> case ArithSub:
</span><del>- case ArithMul:
</del><span class="cx"> switch (node->binaryUseKind()) {
</span><span class="cx"> case Int32Use:
</span><span class="cx"> case Int52RepUse:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -265,11 +265,21 @@
</span><span class="cx">
</span><span class="cx"> case ArithDiv:
</span><span class="cx"> case ArithMod: {
</span><del>- if (Node::shouldSpeculateInt32OrBooleanForArithmetic(node->child1().node(), node->child2().node())
</del><ins>+ Edge& leftChild = node->child1();
+ Edge& rightChild = node->child2();
+ if (op == ArithDiv
+ && (Node::shouldSpeculateUntypedForArithmetic(leftChild.node(), rightChild.node())
+ || m_graph.hasExitSite(node->origin.semantic, BadType))) {
+ fixEdge<UntypedUse>(leftChild);
+ fixEdge<UntypedUse>(rightChild);
+ node->setResult(NodeResultJS);
+ break;
+ }
+ if (Node::shouldSpeculateInt32OrBooleanForArithmetic(leftChild.node(), rightChild.node())
</ins><span class="cx"> && node->canSpeculateInt32(FixupPass)) {
</span><span class="cx"> if (optimizeForX86() || optimizeForARM64() || optimizeForARMv7IDIVSupported()) {
</span><del>- fixIntOrBooleanEdge(node->child1());
- fixIntOrBooleanEdge(node->child2());
</del><ins>+ fixIntOrBooleanEdge(leftChild);
+ fixIntOrBooleanEdge(rightChild);
</ins><span class="cx"> if (bytecodeCanTruncateInteger(node->arithNodeFlags()))
</span><span class="cx"> node->setArithMode(Arith::Unchecked);
</span><span class="cx"> else if (bytecodeCanIgnoreNegativeZero(node->arithNodeFlags()))
</span><span class="lines">@@ -280,8 +290,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This will cause conversion nodes to be inserted later.
</span><del>- fixDoubleOrBooleanEdge(node->child1());
- fixDoubleOrBooleanEdge(node->child2());
</del><ins>+ fixDoubleOrBooleanEdge(leftChild);
+ fixDoubleOrBooleanEdge(rightChild);
</ins><span class="cx">
</span><span class="cx"> // We don't need to do ref'ing on the children because we're stealing them from
</span><span class="cx"> // the original division.
</span><span class="lines">@@ -297,8 +307,8 @@
</span><span class="cx"> node->setArithMode(Arith::CheckOverflowAndNegativeZero);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- fixDoubleOrBooleanEdge(node->child1());
- fixDoubleOrBooleanEdge(node->child2());
</del><ins>+ fixDoubleOrBooleanEdge(leftChild);
+ fixDoubleOrBooleanEdge(rightChild);
</ins><span class="cx"> node->setResult(NodeResultDouble);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -200,6 +200,19 @@
</span><span class="cx"> return JSValue::encode(jsAddSlowCase(exec, op1, op2));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+EncodedJSValue JIT_OPERATION operationValueDiv(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
+{
+ VM* vm = &exec->vm();
+ NativeCallFrameTracer tracer(vm, exec);
+
+ JSValue op1 = JSValue::decode(encodedOp1);
+ JSValue op2 = JSValue::decode(encodedOp2);
+
+ double a = op1.toNumber(exec);
+ double b = op2.toNumber(exec);
+ return JSValue::encode(jsNumber(a / b));
+}
+
</ins><span class="cx"> EncodedJSValue JIT_OPERATION operationValueMul(ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOperationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOperations.h (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOperations.h 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/dfg/DFGOperations.h 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationToThisStrict(ExecState*, EncodedJSValue encodedOp1) WTF_INTERNAL;
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationValueAdd(ExecState*, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2) WTF_INTERNAL;
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationValueAddNotNumber(ExecState*, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2) WTF_INTERNAL;
</span><ins>+EncodedJSValue JIT_OPERATION operationValueDiv(ExecState*, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2) WTF_INTERNAL;
</ins><span class="cx"> EncodedJSValue JIT_OPERATION operationValueMul(ExecState*, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2) WTF_INTERNAL;
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationValueSub(ExecState*, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2) WTF_INTERNAL;
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationGetByVal(ExecState*, EncodedJSValue encodedBase, EncodedJSValue encodedProperty) WTF_INTERNAL;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPredictionPropagationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -354,11 +354,15 @@
</span><span class="cx"> SpeculatedType right = node->child2()->prediction();
</span><span class="cx">
</span><span class="cx"> if (left && right) {
</span><del>- if (Node::shouldSpeculateInt32OrBooleanForArithmetic(node->child1().node(), node->child2().node())
- && node->canSpeculateInt32(m_pass))
- changed |= mergePrediction(SpecInt32);
- else
- changed |= mergePrediction(SpecBytecodeDouble);
</del><ins>+ if (isFullNumberOrBooleanSpeculationExpectingDefined(left)
+ && isFullNumberOrBooleanSpeculationExpectingDefined(right)) {
+ if (Node::shouldSpeculateInt32OrBooleanForArithmetic(node->child1().node(), node->child2().node())
+ && node->canSpeculateInt32(m_pass))
+ changed |= mergePrediction(SpecInt32);
+ else
+ changed |= mergePrediction(SpecBytecodeDouble);
+ } else
+ changed |= mergePrediction(SpecInt32 | SpecBytecodeDouble);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include "DFGSlowPathGenerator.h"
</span><span class="cx"> #include "DirectArguments.h"
</span><span class="cx"> #include "JITAddGenerator.h"
</span><ins>+#include "JITDivGenerator.h"
</ins><span class="cx"> #include "JITMulGenerator.h"
</span><span class="cx"> #include "JITSubGenerator.h"
</span><span class="cx"> #include "JSArrowFunction.h"
</span><span class="lines">@@ -3686,7 +3687,117 @@
</span><span class="cx"> doubleResult(result.fpr(), node);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ case UntypedUse: {
+ Edge& leftChild = node->child1();
+ Edge& rightChild = node->child2();
+
+ if (isKnownNotNumber(leftChild.node()) || isKnownNotNumber(rightChild.node())) {
+ JSValueOperand left(this, leftChild);
+ JSValueOperand right(this, rightChild);
+ JSValueRegs leftRegs = left.jsValueRegs();
+ JSValueRegs rightRegs = right.jsValueRegs();
+#if USE(JSVALUE64)
+ GPRTemporary result(this);
+ JSValueRegs resultRegs = JSValueRegs(result.gpr());
+#else
+ GPRTemporary resultTag(this);
+ GPRTemporary resultPayload(this);
+ JSValueRegs resultRegs = JSValueRegs(resultPayload.gpr(), resultTag.gpr());
+#endif
+ flushRegisters();
+ callOperation(operationValueDiv, resultRegs, leftRegs, rightRegs);
+ m_jit.exceptionCheck();
+
+ jsValueResult(resultRegs, node);
+ return;
+ }
+
+ Optional<JSValueOperand> left;
+ Optional<JSValueOperand> right;
+
+ JSValueRegs leftRegs;
+ JSValueRegs rightRegs;
+
+ FPRTemporary leftNumber(this);
+ FPRTemporary rightNumber(this);
+ FPRReg leftFPR = leftNumber.fpr();
+ FPRReg rightFPR = rightNumber.fpr();
+ FPRTemporary fprScratch(this);
+ FPRReg scratchFPR = fprScratch.fpr();
+
+#if USE(JSVALUE64)
+ GPRTemporary result(this);
+ JSValueRegs resultRegs = JSValueRegs(result.gpr());
+ GPRTemporary scratch(this);
+ GPRReg scratchGPR = scratch.gpr();
+#else
+ GPRTemporary resultTag(this);
+ GPRTemporary resultPayload(this);
+ JSValueRegs resultRegs = JSValueRegs(resultPayload.gpr(), resultTag.gpr());
+ GPRReg scratchGPR = resultTag.gpr();
+#endif
+
+ SnippetOperand leftOperand(m_state.forNode(leftChild).resultType());
+ SnippetOperand rightOperand(m_state.forNode(rightChild).resultType());
+
+ if (leftChild->isInt32Constant())
+ leftOperand.setConstInt32(leftChild->asInt32());
+#if USE(JSVALUE64)
+ else if (leftChild->isDoubleConstant())
+ leftOperand.setConstDouble(leftChild->asNumber());
+#endif
+
+ if (leftOperand.isConst()) {
+ // The snippet generator only supports 1 argument as a constant.
+ // Ignore the rightChild's const-ness.
+ } else if (rightChild->isInt32Constant())
+ rightOperand.setConstInt32(rightChild->asInt32());
+#if USE(JSVALUE64)
+ else if (rightChild->isDoubleConstant())
+ rightOperand.setConstDouble(rightChild->asNumber());
+#endif
+
+ RELEASE_ASSERT(!leftOperand.isConst() || !rightOperand.isConst());
+
+ if (!leftOperand.isConst()) {
+ left = JSValueOperand(this, leftChild);
+ leftRegs = left->jsValueRegs();
+ }
+ if (!rightOperand.isConst()) {
+ right = JSValueOperand(this, rightChild);
+ rightRegs = right->jsValueRegs();
+ }
+
+ JITDivGenerator gen(leftOperand, rightOperand, resultRegs, leftRegs, rightRegs,
+ leftFPR, rightFPR, scratchGPR, scratchFPR);
+ gen.generateFastPath(m_jit);
+
+ ASSERT(gen.didEmitFastPath());
+ gen.endJumpList().append(m_jit.jump());
+
+ gen.slowPathJumpList().link(&m_jit);
+ silentSpillAllRegisters(resultRegs);
+
+ if (leftOperand.isConst()) {
+ leftRegs = resultRegs;
+ m_jit.moveValue(leftChild->asJSValue(), leftRegs);
+ }
+ if (rightOperand.isConst()) {
+ rightRegs = resultRegs;
+ m_jit.moveValue(rightChild->asJSValue(), rightRegs);
+ }
+
+ callOperation(operationValueDiv, resultRegs, leftRegs, rightRegs);
+
+ silentFillAllRegisters(resultRegs);
+ m_jit.exceptionCheck();
+
+ gen.endJumpList().link(&m_jit);
+ jsValueResult(resultRegs, node);
+ return;
+ }
+
</ins><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCompileBinaryOpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCompileBinaryOp.cpp (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCompileBinaryOp.cpp 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/ftl/FTLCompileBinaryOp.cpp 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "FTLInlineCacheDescriptor.h"
</span><span class="cx"> #include "GPRInfo.h"
</span><span class="cx"> #include "JITAddGenerator.h"
</span><ins>+#include "JITDivGenerator.h"
</ins><span class="cx"> #include "JITMulGenerator.h"
</span><span class="cx"> #include "JITSubGenerator.h"
</span><span class="cx"> #include "ScratchRegisterAllocator.h"
</span><span class="lines">@@ -153,7 +154,12 @@
</span><span class="cx"> GPRReg m_savedTagTypeNumberRegister { InvalidGPRReg };
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<typename BinaryArithOpGenerator>
</del><ins>+enum ScratchFPRUsage {
+ DontNeedScratchFPR,
+ NeedScratchFPR
+};
+
+template<typename BinaryArithOpGenerator, ScratchFPRUsage scratchFPRUsage = DontNeedScratchFPR>
</ins><span class="cx"> void generateBinaryArithOpFastPath(BinaryOpDescriptor& ic, CCallHelpers& jit,
</span><span class="cx"> GPRReg result, GPRReg left, GPRReg right, RegisterSet usedRegisters,
</span><span class="cx"> CCallHelpers::Jump& done, CCallHelpers::Jump& slowPathStart)
</span><span class="lines">@@ -166,6 +172,8 @@
</span><span class="cx"> FPRReg leftFPR = allocator.allocateScratchFPR();
</span><span class="cx"> FPRReg rightFPR = allocator.allocateScratchFPR();
</span><span class="cx"> FPRReg scratchFPR = InvalidFPRReg;
</span><ins>+ if (scratchFPRUsage == NeedScratchFPR)
+ scratchFPR = allocator.allocateScratchFPR();
</ins><span class="cx">
</span><span class="cx"> BinaryArithOpGenerator gen(ic.leftOperand(), ic.rightOperand(), JSValueRegs(result),
</span><span class="cx"> JSValueRegs(left), JSValueRegs(right), leftFPR, rightFPR, scratchGPR, scratchFPR);
</span><span class="lines">@@ -195,6 +203,9 @@
</span><span class="cx"> CCallHelpers::Jump& done, CCallHelpers::Jump& slowPathStart)
</span><span class="cx"> {
</span><span class="cx"> switch (ic.nodeType()) {
</span><ins>+ case ArithDiv:
+ generateBinaryArithOpFastPath<JITDivGenerator, NeedScratchFPR>(ic, jit, result, left, right, usedRegisters, done, slowPathStart);
+ break;
</ins><span class="cx"> case ArithMul:
</span><span class="cx"> generateBinaryArithOpFastPath<JITMulGenerator>(ic, jit, result, left, right, usedRegisters, done, slowPathStart);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLInlineCacheDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -165,6 +165,12 @@
</span><span class="cx"> SnippetOperand m_rightOperand;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class ArithDivDescriptor : public BinaryOpDescriptor {
+public:
+ ArithDivDescriptor(unsigned stackmapID, CodeOrigin, const SnippetOperand& leftOperand, const SnippetOperand& rightOperand);
+ static size_t icSize();
+};
+
</ins><span class="cx"> class ArithMulDescriptor : public BinaryOpDescriptor {
</span><span class="cx"> public:
</span><span class="cx"> ArithMulDescriptor(unsigned stackmapID, CodeOrigin, const SnippetOperand& leftOperand, const SnippetOperand& rightOperand);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLInlineCacheDescriptorInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptorInlines.h (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptorInlines.h 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptorInlines.h 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -35,6 +35,18 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace FTL {
</span><span class="cx">
</span><ins>+ArithDivDescriptor::ArithDivDescriptor(unsigned stackmapID, CodeOrigin codeOrigin,
+ const SnippetOperand& leftOperand, const SnippetOperand& rightOperand)
+ : BinaryOpDescriptor(DFG::ArithDiv, stackmapID, codeOrigin, icSize(),
+ "ArithDiv", "ArithDiv IC fast path", DFG::operationValueDiv, leftOperand, rightOperand)
+{
+}
+
+size_t ArithDivDescriptor::icSize()
+{
+ return sizeOfArithDiv();
+}
+
</ins><span class="cx"> ArithMulDescriptor::ArithMulDescriptor(unsigned stackmapID, CodeOrigin codeOrigin,
</span><span class="cx"> const SnippetOperand& leftOperand, const SnippetOperand& rightOperand)
</span><span class="cx"> : BinaryOpDescriptor(DFG::ArithMul, stackmapID, codeOrigin, icSize(),
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLInlineCacheSizecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.cpp 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -128,6 +128,23 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+size_t sizeOfArithDiv()
+{
+#if CPU(ARM64)
+#ifdef NDEBUG
+ return 180; // ARM64 release.
+#else
+ return 276; // ARM64 debug.
+#endif
+#else // CPU(X86_64)
+#ifdef NDEBUG
+ return 199; // X86_64 release.
+#else
+ return 286; // X86_64 debug.
+#endif
+#endif
+}
+
</ins><span class="cx"> size_t sizeOfArithMul()
</span><span class="cx"> {
</span><span class="cx"> #if CPU(ARM64)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLInlineCacheSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.h (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.h 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/ftl/FTLInlineCacheSize.h 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> size_t sizeOfConstructVarargs();
</span><span class="cx"> size_t sizeOfConstructForwardVarargs();
</span><span class="cx"> size_t sizeOfIn();
</span><ins>+size_t sizeOfArithDiv();
</ins><span class="cx"> size_t sizeOfArithMul();
</span><span class="cx"> size_t sizeOfArithSub();
</span><span class="cx"> size_t sizeOfValueAdd();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -240,6 +240,7 @@
</span><span class="cx"> maxNumberOfCatchSpills = std::max(maxNumberOfCatchSpills, m_graph.localsLiveInBytecode(opCatchOrigin).bitCount());
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ case ArithDiv:
</ins><span class="cx"> case ArithMul:
</span><span class="cx"> case ArithSub:
</span><span class="cx"> case GetById:
</span><span class="lines">@@ -1861,7 +1862,7 @@
</span><span class="cx"> // Arguments: id, bytes, target, numArgs, args...
</span><span class="cx"> StackmapArgumentList arguments;
</span><span class="cx"> arguments.append(m_out.constInt64(stackmapID));
</span><del>- arguments.append(m_out.constInt32(ArithSubDescriptor::icSize()));
</del><ins>+ arguments.append(m_out.constInt32(ArithMulDescriptor::icSize()));
</ins><span class="cx"> arguments.append(constNull(m_out.ref8));
</span><span class="cx"> arguments.append(m_out.constInt32(2));
</span><span class="cx"> arguments.append(left);
</span><span class="lines">@@ -1943,7 +1944,72 @@
</span><span class="cx"> lowDouble(m_node->child1()), lowDouble(m_node->child2())));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ case UntypedUse: {
+ Edge& leftChild = m_node->child1();
+ Edge& rightChild = m_node->child2();
+
+ if (!(provenType(leftChild) & SpecFullNumber) || !(provenType(rightChild) & SpecFullNumber)) {
+ setJSValue(vmCall(m_out.int64, m_out.operation(operationValueDiv), m_callFrame,
+ lowJSValue(leftChild), lowJSValue(rightChild)));
+ return;
+ }
+
+ unsigned stackmapID = m_stackmapIDs++;
+
+ if (Options::verboseCompilation())
+ dataLog(" Emitting ArithDiv patchpoint with stackmap #", stackmapID, "\n");
+
+#if FTL_USES_B3
+ CRASH();
+#else
+ LValue left = lowJSValue(leftChild);
+ LValue right = lowJSValue(rightChild);
+
+ SnippetOperand leftOperand(abstractValue(leftChild).resultType());
+ SnippetOperand rightOperand(abstractValue(rightChild).resultType());
+
+ if (leftChild->isInt32Constant())
+ leftOperand.setConstInt32(leftChild->asInt32());
+#if USE(JSVALUE64)
+ else if (leftChild->isDoubleConstant())
+ leftOperand.setConstDouble(leftChild->asNumber());
+#endif
+
+ if (leftOperand.isConst()) {
+ // The snippet generator only supports 1 argument as a constant.
+ // Ignore the rightChild's const-ness.
+ } else if (rightChild->isInt32Constant())
+ rightOperand.setConstInt32(rightChild->asInt32());
+#if USE(JSVALUE64)
+ else if (rightChild->isDoubleConstant())
+ rightOperand.setConstDouble(rightChild->asNumber());
+#endif
+
+ RELEASE_ASSERT(!leftOperand.isConst() || !rightOperand.isConst());
+
+ // Arguments: id, bytes, target, numArgs, args...
+ StackmapArgumentList arguments;
+ arguments.append(m_out.constInt64(stackmapID));
+ arguments.append(m_out.constInt32(ArithDivDescriptor::icSize()));
+ arguments.append(constNull(m_out.ref8));
+ arguments.append(m_out.constInt32(2));
+ arguments.append(left);
+ arguments.append(right);
+
+ appendOSRExitArgumentsForPatchpointIfWillCatchException(arguments,
+ ExceptionType::BinaryOpGenerator, 3); // left, right, and result show up in the stackmap locations.
+
+ LValue call = m_out.call(m_out.int64, m_out.patchpointInt64Intrinsic(), arguments);
+ setInstructionCallingConvention(call, LLVMAnyRegCallConv);
+
+ m_ftlState.binaryOps.append(ArithDivDescriptor(stackmapID, m_node->origin.semantic, leftOperand, rightOperand));
+
+ setJSValue(call);
+#endif // FTL_USES_B3
+ break;
+ }
+
</ins><span class="cx"> default:
</span><span class="cx"> DFG_CRASH(m_graph, m_node, "Bad use kind");
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITArithmeticcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -799,14 +799,13 @@
</span><span class="cx"> JSValueRegs rightRegs = JSValueRegs(regT1);
</span><span class="cx"> JSValueRegs resultRegs = leftRegs;
</span><span class="cx"> GPRReg scratchGPR = regT2;
</span><del>- FPRReg scratchFPR = InvalidFPRReg;
</del><span class="cx"> #else
</span><span class="cx"> JSValueRegs leftRegs = JSValueRegs(regT1, regT0);
</span><span class="cx"> JSValueRegs rightRegs = JSValueRegs(regT3, regT2);
</span><span class="cx"> JSValueRegs resultRegs = leftRegs;
</span><span class="cx"> GPRReg scratchGPR = regT4;
</span><del>- FPRReg scratchFPR = fpRegT2;
</del><span class="cx"> #endif
</span><ins>+ FPRReg scratchFPR = fpRegT2;
</ins><span class="cx">
</span><span class="cx"> uint32_t* profilingCounter = &m_codeBlock->addSpecialFastCaseProfile(m_bytecodeOffset)->m_counter;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressop_divjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/op_div.js (193780 => 193781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/op_div.js 2015-12-08 21:41:04 UTC (rev 193780)
+++ trunk/Source/JavaScriptCore/tests/stress/op_div.js 2015-12-08 21:44:12 UTC (rev 193781)
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx"> '-0x7fff',
</span><span class="cx"> '0x10000',
</span><span class="cx"> '-0x10000',
</span><del>- '0x7ffffff',
- '-0x7ffffff',
</del><ins>+ '0x7fffffff',
+ '-0x7fffffff',
</ins><span class="cx"> '0x100000000',
</span><span class="cx"> '-0x100000000',
</span><span class="cx">
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> '"-0x7fff"',
</span><span class="cx"> '"0x10000"',
</span><span class="cx"> '"-0x10000"',
</span><del>- '"0x7ffffff"',
- '"-0x7ffffff"',
</del><ins>+ '"0x7fffffff"',
+ '"-0x7fffffff"',
</ins><span class="cx"> '"0x100000000"',
</span><span class="cx"> '"-0x100000000"',
</span><span class="cx"> ];
</span></span></pre>
</div>
</div>
</body>
</html>