<!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>[161218] trunk/Source/JavaScriptCore</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/161218">161218</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-02 12:15:25 -0800 (Thu, 02 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rationalize DFG DCE
https://bugs.webkit.org/show_bug.cgi?id=125523
Reviewed by Mark Hahnenberg.
Adds the ability to DCE more things. It's now the case that if a node is completely
pure, we clear NodeMustGenerate and the node becomes a DCE candidate.
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* dfg/DFGCSEPhase.cpp:
(JSC::DFG::CSEPhase::performNodeCSE):
* dfg/DFGClobberize.h:
(JSC::DFG::clobberize):
* dfg/DFGDCEPhase.cpp:
(JSC::DFG::DCEPhase::cleanVariables):
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::fixupNode):
* dfg/DFGGraph.h:
(JSC::DFG::Graph::clobbersWorld):
* dfg/DFGNodeType.h:
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileAdd):
* dfg/DFGSpeculativeJIT.h:
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileNode):
(JSC::FTL::LowerDFGToLLVM::compileValueAdd):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceJavaScriptCoredfgDFGCSEPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGClobberizeh">trunk/Source/JavaScriptCore/dfg/DFGClobberize.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGDCEPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGDCEPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFixupPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphh">trunk/Source/JavaScriptCore/dfg/DFGGraph.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeTypeh">trunk/Source/JavaScriptCore/dfg/DFGNodeType.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITh">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161217 => 161218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-02 20:11:55 UTC (rev 161217)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-02 20:15:25 UTC (rev 161218)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-01-01 Filip Pizlo <fpizlo@apple.com>
+
+ Rationalize DFG DCE
+ https://bugs.webkit.org/show_bug.cgi?id=125523
+
+ Reviewed by Mark Hahnenberg.
+
+ Adds the ability to DCE more things. It's now the case that if a node is completely
+ pure, we clear NodeMustGenerate and the node becomes a DCE candidate.
+
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * dfg/DFGCSEPhase.cpp:
+ (JSC::DFG::CSEPhase::performNodeCSE):
+ * dfg/DFGClobberize.h:
+ (JSC::DFG::clobberize):
+ * dfg/DFGDCEPhase.cpp:
+ (JSC::DFG::DCEPhase::cleanVariables):
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+ * dfg/DFGGraph.h:
+ (JSC::DFG::Graph::clobbersWorld):
+ * dfg/DFGNodeType.h:
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileAdd):
+ * dfg/DFGSpeculativeJIT.h:
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileNode):
+ (JSC::FTL::LowerDFGToLLVM::compileValueAdd):
+
</ins><span class="cx"> 2014-01-02 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Attempt to fix the build of WebCore's code generator on CMake based system
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (161217 => 161218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-01-02 20:11:55 UTC (rev 161217)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-01-02 20:15:25 UTC (rev 161218)
</span><span class="lines">@@ -340,7 +340,19 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case ValueAdd:
</del><ins>+ case ValueAdd: {
+ JSValue left = forNode(node->child1()).value();
+ JSValue right = forNode(node->child2()).value();
+ if (left && right && left.isNumber() && right.isNumber()) {
+ setConstant(node, JSValue(left.asNumber() + right.asNumber()));
+ break;
+ }
+ ASSERT(node->binaryUseKind() == UntypedUse);
+ clobberWorld(node->codeOrigin, clobberLimit);
+ forNode(node).setType(SpecString | SpecBytecodeNumber);
+ break;
+ }
+
</ins><span class="cx"> case ArithAdd: {
</span><span class="cx"> JSValue left = forNode(node->child1()).value();
</span><span class="cx"> JSValue right = forNode(node->child2()).value();
</span><span class="lines">@@ -368,9 +380,7 @@
</span><span class="cx"> forNode(node).setType(SpecDouble);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- RELEASE_ASSERT(node->op() == ValueAdd);
- clobberWorld(node->codeOrigin, clobberLimit);
- forNode(node).setType(SpecString | SpecBytecodeNumber);
</del><ins>+ RELEASE_ASSERT_NOT_REACHED();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCSEPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp (161217 => 161218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp 2014-01-02 20:11:55 UTC (rev 161217)
+++ trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp 2014-01-02 20:15:25 UTC (rev 161218)
</span><span class="lines">@@ -1239,7 +1239,6 @@
</span><span class="cx">
</span><span class="cx"> // Handle nodes that are conditionally pure: these are pure, and can
</span><span class="cx"> // be CSE'd, so long as the prediction is the one we want.
</span><del>- case ValueAdd:
</del><span class="cx"> case CompareLess:
</span><span class="cx"> case CompareLessEq:
</span><span class="cx"> case CompareGreater:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGClobberizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGClobberize.h (161217 => 161218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2014-01-02 20:11:55 UTC (rev 161217)
+++ trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2014-01-02 20:15:25 UTC (rev 161218)
</span><span class="lines">@@ -204,25 +204,11 @@
</span><span class="cx"> case In:
</span><span class="cx"> case GetMyArgumentsLengthSafe:
</span><span class="cx"> case GetMyArgumentByValSafe:
</span><ins>+ case ValueAdd:
</ins><span class="cx"> read(World);
</span><span class="cx"> write(World);
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- case ValueAdd:
- switch (node->binaryUseKind()) {
- case Int32Use:
- case NumberUse:
- case MachineIntUse:
- return;
- case UntypedUse:
- read(World);
- write(World);
- return;
- default:
- RELEASE_ASSERT_NOT_REACHED();
- return;
- }
-
</del><span class="cx"> case GetCallee:
</span><span class="cx"> read(AbstractHeap(Variables, JSStack::Callee));
</span><span class="cx"> return;
</span><span class="lines">@@ -579,30 +565,17 @@
</span><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ case CompareEq:
</ins><span class="cx"> case CompareLess:
</span><span class="cx"> case CompareLessEq:
</span><span class="cx"> case CompareGreater:
</span><span class="cx"> case CompareGreaterEq:
</span><del>- if (graph.isPredictedNumerical(node))
</del><ins>+ if (!node->isBinaryUseKind(UntypedUse))
</ins><span class="cx"> return;
</span><span class="cx"> read(World);
</span><span class="cx"> write(World);
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- case CompareEq:
- if (graph.isPredictedNumerical(node)
- || node->isBinaryUseKind(StringUse)
- || node->isBinaryUseKind(StringIdentUse))
- return;
-
- if ((node->child1().useKind() == ObjectUse || node->child1().useKind() == ObjectOrOtherUse)
- && (node->child2().useKind() == ObjectUse || node->child2().useKind() == ObjectOrOtherUse))
- return;
-
- read(World);
- write(World);
- return;
-
</del><span class="cx"> case ToString:
</span><span class="cx"> switch (node->child1().useKind()) {
</span><span class="cx"> case StringObjectUse:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDCEPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDCEPhase.cpp (161217 => 161218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDCEPhase.cpp 2014-01-02 20:11:55 UTC (rev 161217)
+++ trunk/Source/JavaScriptCore/dfg/DFGDCEPhase.cpp 2014-01-02 20:15:25 UTC (rev 161218)
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> if (node->op() == GetLocal) {
</span><span class="cx"> node = node->child1().node();
</span><del>- ASSERT(node->op() == Phi);
</del><ins>+ ASSERT(node->op() == Phi || node->op() == SetArgument);
</ins><span class="cx"> if (node->shouldGenerate()) {
</span><span class="cx"> variables[i] = node;
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (161217 => 161218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-01-02 20:11:55 UTC (rev 161217)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-01-02 20:15:25 UTC (rev 161218)
</span><span class="lines">@@ -154,11 +154,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case ValueAdd: {
</span><del>- if (attemptToMakeIntegerAdd(node))
</del><ins>+ if (attemptToMakeIntegerAdd(node)) {
+ node->setOp(ArithAdd);
+ node->clearFlags(NodeMustGenerate | NodeClobbersWorld);
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> if (Node::shouldSpeculateNumberExpectingDefined(node->child1().node(), node->child2().node())) {
</span><span class="cx"> fixEdge<NumberUse>(node->child1());
</span><span class="cx"> fixEdge<NumberUse>(node->child2());
</span><ins>+ node->setOp(ArithAdd);
+ node->clearFlags(NodeMustGenerate | NodeClobbersWorld);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -326,17 +331,20 @@
</span><span class="cx"> if (Node::shouldSpeculateInt32(node->child1().node(), node->child2().node())) {
</span><span class="cx"> fixEdge<Int32Use>(node->child1());
</span><span class="cx"> fixEdge<Int32Use>(node->child2());
</span><ins>+ node->clearFlags(NodeMustGenerate | NodeClobbersWorld);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (enableInt52()
</span><span class="cx"> && Node::shouldSpeculateMachineInt(node->child1().node(), node->child2().node())) {
</span><span class="cx"> fixEdge<MachineIntUse>(node->child1());
</span><span class="cx"> fixEdge<MachineIntUse>(node->child2());
</span><ins>+ node->clearFlags(NodeMustGenerate | NodeClobbersWorld);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (Node::shouldSpeculateNumber(node->child1().node(), node->child2().node())) {
</span><span class="cx"> fixEdge<NumberUse>(node->child1());
</span><span class="cx"> fixEdge<NumberUse>(node->child2());
</span><ins>+ node->clearFlags(NodeMustGenerate | NodeClobbersWorld);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (node->op() != CompareEq)
</span><span class="lines">@@ -344,31 +352,37 @@
</span><span class="cx"> if (Node::shouldSpeculateBoolean(node->child1().node(), node->child2().node())) {
</span><span class="cx"> fixEdge<BooleanUse>(node->child1());
</span><span class="cx"> fixEdge<BooleanUse>(node->child2());
</span><ins>+ node->clearFlags(NodeMustGenerate | NodeClobbersWorld);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (node->child1()->shouldSpeculateStringIdent() && node->child2()->shouldSpeculateStringIdent()) {
</span><span class="cx"> fixEdge<StringIdentUse>(node->child1());
</span><span class="cx"> fixEdge<StringIdentUse>(node->child2());
</span><ins>+ node->clearFlags(NodeMustGenerate | NodeClobbersWorld);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (node->child1()->shouldSpeculateString() && node->child2()->shouldSpeculateString() && GPRInfo::numberOfRegisters >= 7) {
</span><span class="cx"> fixEdge<StringUse>(node->child1());
</span><span class="cx"> fixEdge<StringUse>(node->child2());
</span><ins>+ node->clearFlags(NodeMustGenerate | NodeClobbersWorld);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (node->child1()->shouldSpeculateObject() && node->child2()->shouldSpeculateObject()) {
</span><span class="cx"> fixEdge<ObjectUse>(node->child1());
</span><span class="cx"> fixEdge<ObjectUse>(node->child2());
</span><ins>+ node->clearFlags(NodeMustGenerate | NodeClobbersWorld);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (node->child1()->shouldSpeculateObject() && node->child2()->shouldSpeculateObjectOrOther()) {
</span><span class="cx"> fixEdge<ObjectUse>(node->child1());
</span><span class="cx"> fixEdge<ObjectOrOtherUse>(node->child2());
</span><ins>+ node->clearFlags(NodeMustGenerate | NodeClobbersWorld);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (node->child1()->shouldSpeculateObjectOrOther() && node->child2()->shouldSpeculateObject()) {
</span><span class="cx"> fixEdge<ObjectOrOtherUse>(node->child1());
</span><span class="cx"> fixEdge<ObjectUse>(node->child2());
</span><ins>+ node->clearFlags(NodeMustGenerate | NodeClobbersWorld);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.h (161217 => 161218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2014-01-02 20:11:55 UTC (rev 161217)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2014-01-02 20:15:25 UTC (rev 161218)
</span><span class="lines">@@ -648,13 +648,6 @@
</span><span class="cx"> if (!(node->flags() & NodeMightClobber))
</span><span class="cx"> return false;
</span><span class="cx"> switch (node->op()) {
</span><del>- case ValueAdd:
- case CompareLess:
- case CompareLessEq:
- case CompareGreater:
- case CompareGreaterEq:
- case CompareEq:
- return !isPredictedNumerical(node);
</del><span class="cx"> case GetByVal:
</span><span class="cx"> case PutByValDirect:
</span><span class="cx"> case PutByVal:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNodeType.h (161217 => 161218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNodeType.h 2014-01-02 20:11:55 UTC (rev 161217)
+++ trunk/Source/JavaScriptCore/dfg/DFGNodeType.h 2014-01-02 20:15:25 UTC (rev 161218)
</span><span class="lines">@@ -96,12 +96,12 @@
</span><span class="cx"> macro(InvalidationPoint, NodeMustGenerate) \
</span><span class="cx"> \
</span><span class="cx"> /* Nodes for bitwise operations. */\
</span><del>- macro(BitAnd, NodeResultInt32 | NodeMustGenerate) \
- macro(BitOr, NodeResultInt32 | NodeMustGenerate) \
- macro(BitXor, NodeResultInt32 | NodeMustGenerate) \
- macro(BitLShift, NodeResultInt32 | NodeMustGenerate) \
- macro(BitRShift, NodeResultInt32 | NodeMustGenerate) \
- macro(BitURShift, NodeResultInt32 | NodeMustGenerate) \
</del><ins>+ macro(BitAnd, NodeResultInt32) \
+ macro(BitOr, NodeResultInt32) \
+ macro(BitXor, NodeResultInt32) \
+ macro(BitLShift, NodeResultInt32) \
+ macro(BitRShift, NodeResultInt32) \
+ macro(BitURShift, NodeResultInt32) \
</ins><span class="cx"> /* Bitwise operators call ToInt32 on their operands. */\
</span><span class="cx"> macro(ValueToInt32, NodeResultInt32) \
</span><span class="cx"> /* Used to box the result of URShift nodes (result has range 0..2^32-1). */\
</span><span class="lines">@@ -118,22 +118,22 @@
</span><span class="cx"> macro(Int52ToDouble, NodeResultNumber) \
</span><span class="cx"> \
</span><span class="cx"> /* Nodes for arithmetic operations. */\
</span><del>- macro(ArithAdd, NodeResultNumber | NodeMustGenerate) \
- macro(ArithSub, NodeResultNumber | NodeMustGenerate) \
- macro(ArithNegate, NodeResultNumber | NodeMustGenerate) \
- macro(ArithMul, NodeResultNumber | NodeMustGenerate) \
- macro(ArithIMul, NodeResultInt32 | NodeMustGenerate) \
- macro(ArithDiv, NodeResultNumber | NodeMustGenerate) \
- macro(ArithMod, NodeResultNumber | NodeMustGenerate) \
- macro(ArithAbs, NodeResultNumber | NodeMustGenerate) \
- macro(ArithMin, NodeResultNumber | NodeMustGenerate) \
- macro(ArithMax, NodeResultNumber | NodeMustGenerate) \
- macro(ArithSqrt, NodeResultNumber | NodeMustGenerate) \
- macro(ArithSin, NodeResultNumber | NodeMustGenerate) \
- macro(ArithCos, NodeResultNumber | NodeMustGenerate) \
</del><ins>+ macro(ArithAdd, NodeResultNumber) \
+ macro(ArithSub, NodeResultNumber) \
+ macro(ArithNegate, NodeResultNumber) \
+ macro(ArithMul, NodeResultNumber) \
+ macro(ArithIMul, NodeResultInt32) \
+ macro(ArithDiv, NodeResultNumber) \
+ macro(ArithMod, NodeResultNumber) \
+ macro(ArithAbs, NodeResultNumber) \
+ macro(ArithMin, NodeResultNumber) \
+ macro(ArithMax, NodeResultNumber) \
+ macro(ArithSqrt, NodeResultNumber) \
+ macro(ArithSin, NodeResultNumber) \
+ macro(ArithCos, NodeResultNumber) \
</ins><span class="cx"> \
</span><span class="cx"> /* Add of values may either be arithmetic, or result in string concatenation. */\
</span><del>- macro(ValueAdd, NodeResultJS | NodeMustGenerate | NodeMightClobber) \
</del><ins>+ macro(ValueAdd, NodeResultJS | NodeMustGenerate | NodeClobbersWorld) \
</ins><span class="cx"> \
</span><span class="cx"> /* Property access. */\
</span><span class="cx"> /* PutByValAlias indicates a 'put' aliases a prior write to the same property. */\
</span><span class="lines">@@ -208,12 +208,12 @@
</span><span class="cx"> macro(StringFromCharCode, NodeResultJS) \
</span><span class="cx"> \
</span><span class="cx"> /* Nodes for comparison operations. */\
</span><del>- macro(CompareLess, NodeResultBoolean | NodeMustGenerate | NodeMightClobber) \
- macro(CompareLessEq, NodeResultBoolean | NodeMustGenerate | NodeMightClobber) \
- macro(CompareGreater, NodeResultBoolean | NodeMustGenerate | NodeMightClobber) \
- macro(CompareGreaterEq, NodeResultBoolean | NodeMustGenerate | NodeMightClobber) \
- macro(CompareEq, NodeResultBoolean | NodeMustGenerate | NodeMightClobber) \
- macro(CompareEqConstant, NodeResultBoolean | NodeMustGenerate) \
</del><ins>+ macro(CompareLess, NodeResultBoolean | NodeMustGenerate | NodeClobbersWorld) \
+ macro(CompareLessEq, NodeResultBoolean | NodeMustGenerate | NodeClobbersWorld) \
+ macro(CompareGreater, NodeResultBoolean | NodeMustGenerate | NodeClobbersWorld) \
+ macro(CompareGreaterEq, NodeResultBoolean | NodeMustGenerate | NodeClobbersWorld) \
+ macro(CompareEq, NodeResultBoolean | NodeMustGenerate | NodeClobbersWorld) \
+ macro(CompareEqConstant, NodeResultBoolean) \
</ins><span class="cx"> macro(CompareStrictEq, NodeResultBoolean) \
</span><span class="cx"> macro(CompareStrictEqConstant, NodeResultBoolean) \
</span><span class="cx"> \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (161217 => 161218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-01-02 20:11:55 UTC (rev 161217)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-01-02 20:15:25 UTC (rev 161218)
</span><span class="lines">@@ -2685,12 +2685,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case UntypedUse: {
- RELEASE_ASSERT(node->op() == ValueAdd);
- compileValueAdd(node);
- return;
- }
-
</del><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h (161217 => 161218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2014-01-02 20:11:55 UTC (rev 161217)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2014-01-02 20:15:25 UTC (rev 161218)
</span><span class="lines">@@ -1966,7 +1966,6 @@
</span><span class="cx"> void compilePeepHoleObjectToObjectOrOtherEquality(Edge leftChild, Edge rightChild, Node* branchNode);
</span><span class="cx"> void compileObjectEquality(Node*);
</span><span class="cx"> void compileObjectToObjectOrOtherEquality(Edge leftChild, Edge rightChild);
</span><del>- void compileValueAdd(Node*);
</del><span class="cx"> void compileObjectOrOtherLogicalNot(Edge value);
</span><span class="cx"> void compileLogicalNot(Node*);
</span><span class="cx"> void compileStringEquality(Node*);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (161217 => 161218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-01-02 20:11:55 UTC (rev 161217)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-01-02 20:15:25 UTC (rev 161218)
</span><span class="lines">@@ -1418,28 +1418,6 @@
</span><span class="cx"> booleanResult(resultPayload.gpr(), node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SpeculativeJIT::compileValueAdd(Node* node)
-{
- JSValueOperand op1(this, node->child1());
- JSValueOperand op2(this, node->child2());
-
- GPRReg op1TagGPR = op1.tagGPR();
- GPRReg op1PayloadGPR = op1.payloadGPR();
- GPRReg op2TagGPR = op2.tagGPR();
- GPRReg op2PayloadGPR = op2.payloadGPR();
-
- flushRegisters();
-
- GPRResult2 resultTag(this);
- GPRResult resultPayload(this);
- if (isKnownNotNumber(node->child1().node()) || isKnownNotNumber(node->child2().node()))
- callOperation(operationValueAddNotNumber, resultTag.gpr(), resultPayload.gpr(), op1TagGPR, op1PayloadGPR, op2TagGPR, op2PayloadGPR);
- else
- callOperation(operationValueAdd, resultTag.gpr(), resultPayload.gpr(), op1TagGPR, op1PayloadGPR, op2TagGPR, op2PayloadGPR);
-
- jsValueResult(resultTag.gpr(), resultPayload.gpr(), node);
-}
-
</del><span class="cx"> void SpeculativeJIT::compileObjectOrOtherLogicalNot(Edge nodeUse)
</span><span class="cx"> {
</span><span class="cx"> JSValueOperand value(this, nodeUse, ManualOperandSpeculation);
</span><span class="lines">@@ -2072,7 +2050,28 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case ValueAdd:
</del><ins>+ case ValueAdd: {
+ JSValueOperand op1(this, node->child1());
+ JSValueOperand op2(this, node->child2());
+
+ GPRReg op1TagGPR = op1.tagGPR();
+ GPRReg op1PayloadGPR = op1.payloadGPR();
+ GPRReg op2TagGPR = op2.tagGPR();
+ GPRReg op2PayloadGPR = op2.payloadGPR();
+
+ flushRegisters();
+
+ GPRResult2 resultTag(this);
+ GPRResult resultPayload(this);
+ if (isKnownNotNumber(node->child1().node()) || isKnownNotNumber(node->child2().node()))
+ callOperation(operationValueAddNotNumber, resultTag.gpr(), resultPayload.gpr(), op1TagGPR, op1PayloadGPR, op2TagGPR, op2PayloadGPR);
+ else
+ callOperation(operationValueAdd, resultTag.gpr(), resultPayload.gpr(), op1TagGPR, op1PayloadGPR, op2TagGPR, op2PayloadGPR);
+
+ jsValueResult(resultTag.gpr(), resultPayload.gpr(), node);
+ break;
+ }
+
</ins><span class="cx"> case ArithAdd:
</span><span class="cx"> compileAdd(node);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (161217 => 161218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-01-02 20:11:55 UTC (rev 161217)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-01-02 20:15:25 UTC (rev 161218)
</span><span class="lines">@@ -1806,25 +1806,6 @@
</span><span class="cx"> jsValueResult(result.gpr(), node, DataFormatJSBoolean);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SpeculativeJIT::compileValueAdd(Node* node)
-{
- JSValueOperand op1(this, node->child1());
- JSValueOperand op2(this, node->child2());
-
- GPRReg op1GPR = op1.gpr();
- GPRReg op2GPR = op2.gpr();
-
- flushRegisters();
-
- GPRResult result(this);
- if (isKnownNotNumber(node->child1().node()) || isKnownNotNumber(node->child2().node()))
- callOperation(operationValueAddNotNumber, result.gpr(), op1GPR, op2GPR);
- else
- callOperation(operationValueAdd, result.gpr(), op1GPR, op2GPR);
-
- jsValueResult(result.gpr(), node);
-}
-
</del><span class="cx"> void SpeculativeJIT::compileObjectOrOtherLogicalNot(Edge nodeUse)
</span><span class="cx"> {
</span><span class="cx"> JSValueOperand value(this, nodeUse, ManualOperandSpeculation);
</span><span class="lines">@@ -2403,7 +2384,25 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case ValueAdd:
</del><ins>+ case ValueAdd: {
+ JSValueOperand op1(this, node->child1());
+ JSValueOperand op2(this, node->child2());
+
+ GPRReg op1GPR = op1.gpr();
+ GPRReg op2GPR = op2.gpr();
+
+ flushRegisters();
+
+ GPRResult result(this);
+ if (isKnownNotNumber(node->child1().node()) || isKnownNotNumber(node->child2().node()))
+ callOperation(operationValueAddNotNumber, result.gpr(), op1GPR, op2GPR);
+ else
+ callOperation(operationValueAdd, result.gpr(), op1GPR, op2GPR);
+
+ jsValueResult(result.gpr(), node);
+ break;
+ }
+
</ins><span class="cx"> case ArithAdd:
</span><span class="cx"> compileAdd(node);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (161217 => 161218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-01-02 20:11:55 UTC (rev 161217)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-01-02 20:15:25 UTC (rev 161218)
</span><span class="lines">@@ -261,8 +261,10 @@
</span><span class="cx"> case Phantom:
</span><span class="cx"> compilePhantom();
</span><span class="cx"> break;
</span><ins>+ case ValueAdd:
+ compileValueAdd();
+ break;
</ins><span class="cx"> case ArithAdd:
</span><del>- case ValueAdd:
</del><span class="cx"> compileAddSub();
</span><span class="cx"> break;
</span><span class="cx"> case ArithSub:
</span><span class="lines">@@ -763,6 +765,19 @@
</span><span class="cx"> DFG_NODE_DO_TO_CHILDREN(m_graph, m_node, speculate);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void compileValueAdd()
+ {
+ J_JITOperation_EJJ operation;
+ if (!(m_state.forNode(m_node->child1()).m_type & SpecFullNumber)
+ && !(m_state.forNode(m_node->child2()).m_type & SpecFullNumber))
+ operation = operationValueAddNotNumber;
+ else
+ operation = operationValueAdd;
+ setJSValue(vmCall(
+ m_out.operation(operation), m_callFrame,
+ lowJSValue(m_node->child1()), lowJSValue(m_node->child2())));
+ }
+
</ins><span class="cx"> void compileAddSub()
</span><span class="cx"> {
</span><span class="cx"> bool isSub = m_node->op() == ArithSub;
</span></span></pre>
</div>
</div>
</body>
</html>