<!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>[183201] 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/183201">183201</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-04-23 12:25:10 -0700 (Thu, 23 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename HardPhantom to MustGenerate.
Rubber stamped by Geoffrey Garen.
We are steadily moving towards Phantom just being a backend hack in the DFG. HardPhantom
is more than that; it's a utility for forcing the execution of otherwise killable nodes.
NodeMustGenerate is the flag we use to indicate that something isn't killable. So this
node should just be called MustGenerate.
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* dfg/DFGArgumentsEliminationPhase.cpp:
* dfg/DFGClobberize.h:
(JSC::DFG::clobberize):
* dfg/DFGDCEPhase.cpp:
(JSC::DFG::DCEPhase::run):
* dfg/DFGDoesGC.cpp:
(JSC::DFG::doesGC):
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::fixupNode):
(JSC::DFG::FixupPhase::tryToRelaxRepresentation):
* dfg/DFGIntegerCheckCombiningPhase.cpp:
(JSC::DFG::IntegerCheckCombiningPhase::insertMustAdd):
* dfg/DFGMayExit.cpp:
(JSC::DFG::mayExit):
* dfg/DFGNode.h:
(JSC::DFG::Node::willHaveCodeGenOrOSR):
* dfg/DFGNodeType.h:
* dfg/DFGObjectAllocationSinkingPhase.cpp:
(JSC::DFG::ObjectAllocationSinkingPhase::handleNode):
* dfg/DFGPhantomCanonicalizationPhase.cpp:
(JSC::DFG::PhantomCanonicalizationPhase::run):
* dfg/DFGPhantomRemovalPhase.cpp:
(JSC::DFG::PhantomRemovalPhase::run):
* dfg/DFGPredictionPropagationPhase.cpp:
(JSC::DFG::PredictionPropagationPhase::propagate):
* dfg/DFGSafeToExecute.h:
(JSC::DFG::safeToExecute):
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGTypeCheckHoistingPhase.cpp:
(JSC::DFG::TypeCheckHoistingPhase::identifyRedundantStructureChecks):
(JSC::DFG::TypeCheckHoistingPhase::identifyRedundantArrayChecks):
* dfg/DFGVarargsForwardingPhase.cpp:
* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileNode):</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="#trunkSourceJavaScriptCoredfgDFGArgumentsEliminationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.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="#trunkSourceJavaScriptCoredfgDFGDoesGCcpp">trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFixupPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGIntegerCheckCombiningPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGIntegerCheckCombiningPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGMayExitcpp">trunk/Source/JavaScriptCore/dfg/DFGMayExit.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeh">trunk/Source/JavaScriptCore/dfg/DFGNode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeTypeh">trunk/Source/JavaScriptCore/dfg/DFGNodeType.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGObjectAllocationSinkingPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPhantomCanonicalizationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGPhantomCanonicalizationPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPhantomRemovalPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGPhantomRemovalPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPredictionPropagationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSafeToExecuteh">trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.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="#trunkSourceJavaScriptCoredfgDFGTypeCheckHoistingPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGTypeCheckHoistingPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGVarargsForwardingPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGVarargsForwardingPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCapabilitiescpp">trunk/Source/JavaScriptCore/ftl/FTLCapabilities.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 (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -1,3 +1,56 @@
</span><ins>+2015-04-23 Filip Pizlo <fpizlo@apple.com>
+
+ Rename HardPhantom to MustGenerate.
+
+ Rubber stamped by Geoffrey Garen.
+
+ We are steadily moving towards Phantom just being a backend hack in the DFG. HardPhantom
+ is more than that; it's a utility for forcing the execution of otherwise killable nodes.
+ NodeMustGenerate is the flag we use to indicate that something isn't killable. So this
+ node should just be called MustGenerate.
+
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * dfg/DFGArgumentsEliminationPhase.cpp:
+ * dfg/DFGClobberize.h:
+ (JSC::DFG::clobberize):
+ * dfg/DFGDCEPhase.cpp:
+ (JSC::DFG::DCEPhase::run):
+ * dfg/DFGDoesGC.cpp:
+ (JSC::DFG::doesGC):
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+ (JSC::DFG::FixupPhase::tryToRelaxRepresentation):
+ * dfg/DFGIntegerCheckCombiningPhase.cpp:
+ (JSC::DFG::IntegerCheckCombiningPhase::insertMustAdd):
+ * dfg/DFGMayExit.cpp:
+ (JSC::DFG::mayExit):
+ * dfg/DFGNode.h:
+ (JSC::DFG::Node::willHaveCodeGenOrOSR):
+ * dfg/DFGNodeType.h:
+ * dfg/DFGObjectAllocationSinkingPhase.cpp:
+ (JSC::DFG::ObjectAllocationSinkingPhase::handleNode):
+ * dfg/DFGPhantomCanonicalizationPhase.cpp:
+ (JSC::DFG::PhantomCanonicalizationPhase::run):
+ * dfg/DFGPhantomRemovalPhase.cpp:
+ (JSC::DFG::PhantomRemovalPhase::run):
+ * dfg/DFGPredictionPropagationPhase.cpp:
+ (JSC::DFG::PredictionPropagationPhase::propagate):
+ * dfg/DFGSafeToExecute.h:
+ (JSC::DFG::safeToExecute):
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGTypeCheckHoistingPhase.cpp:
+ (JSC::DFG::TypeCheckHoistingPhase::identifyRedundantStructureChecks):
+ (JSC::DFG::TypeCheckHoistingPhase::identifyRedundantArrayChecks):
+ * dfg/DFGVarargsForwardingPhase.cpp:
+ * ftl/FTLCapabilities.cpp:
+ (JSC::FTL::canCompile):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileNode):
+
</ins><span class="cx"> 2015-04-23 Jordan Harband <ljharb@gmail.com>
</span><span class="cx">
</span><span class="cx"> Implement `Object.assign`
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -2068,7 +2068,7 @@
</span><span class="cx"> case ProfileType:
</span><span class="cx"> case ProfileControlFlow:
</span><span class="cx"> case Phantom:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case CountExecution:
</span><span class="cx"> case CheckTierUpInLoop:
</span><span class="cx"> case CheckTierUpAtReturn:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGArgumentsEliminationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx">
</span><span class="cx"> case Phantom:
</span><span class="cx"> case Check:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case MovHint:
</span><span class="cx"> case PutHint:
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGClobberizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGClobberize.h (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> case Identity:
</span><span class="cx"> case Phantom:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case Check:
</span><span class="cx"> case ExtractOSREntryLocal:
</span><span class="cx"> case CheckStructureImmediate:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDCEPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDCEPhase.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDCEPhase.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGDCEPhase.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> cleanVariables(m_graph.m_arguments);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Just do a basic HardPhantom/Phantom/Check clean-up.
</del><ins>+ // Just do a basic MustGenerate/Phantom/Check clean-up.
</ins><span class="cx"> for (BlockIndex blockIndex = m_graph.numBlocks(); blockIndex--;) {
</span><span class="cx"> BasicBlock* block = m_graph.block(blockIndex);
</span><span class="cx"> if (!block)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> Node* node = block->at(sourceIndex++);
</span><span class="cx"> switch (node->op()) {
</span><span class="cx"> case Check:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case Phantom:
</span><span class="cx"> if (node->children.isEmpty())
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDoesGCcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> case MovHint:
</span><span class="cx"> case ZombieHint:
</span><span class="cx"> case Phantom:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case Upsilon:
</span><span class="cx"> case Phi:
</span><span class="cx"> case Flush:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -1027,7 +1027,7 @@
</span><span class="cx"> case ConstantStoragePointer:
</span><span class="cx"> case DoubleAsInt32:
</span><span class="cx"> case ValueToInt32:
</span><del>- case HardPhantom: // HardPhantom would be trivial to handle but anyway we assert that we won't see it here yet.
</del><ins>+ case MustGenerate: // MustGenerate would be trivial to handle but anyway we assert that we won't see it here yet.
</ins><span class="cx"> case DoubleRep:
</span><span class="cx"> case ValueRep:
</span><span class="cx"> case Int52Rep:
</span><span class="lines">@@ -2011,7 +2011,7 @@
</span><span class="cx"> case MovHint:
</span><span class="cx"> case Phantom:
</span><span class="cx"> case Check:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> DFG_NODE_DO_TO_CHILDREN(m_graph, m_currentNode, fixEdgeRepresentation);
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGIntegerCheckCombiningPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGIntegerCheckCombiningPhase.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGIntegerCheckCombiningPhase.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGIntegerCheckCombiningPhase.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> {
</span><span class="cx"> Node* result = insertAdd(nodeIndex, origin, source, addend);
</span><span class="cx"> m_insertionSet.insertNode(
</span><del>- nodeIndex, SpecNone, HardPhantom, origin, result->defaultEdge());
</del><ins>+ nodeIndex, SpecNone, MustGenerate, origin, result->defaultEdge());
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGMayExitcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGMayExit.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGMayExit.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGMayExit.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> case Flush:
</span><span class="cx"> case Phantom:
</span><span class="cx"> case Check:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case GetLocal:
</span><span class="cx"> case LoopHint:
</span><span class="cx"> case Phi:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNode.h (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNode.h 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGNode.h 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -1543,7 +1543,7 @@
</span><span class="cx"> case ZombieHint:
</span><span class="cx"> return true;
</span><span class="cx"> case Phantom:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> return child1().useKindUnchecked() != UntypedUse || child2().useKindUnchecked() != UntypedUse || child3().useKindUnchecked() != UntypedUse;
</span><span class="cx"> default:
</span><span class="cx"> return shouldGenerate();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNodeType.h (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNodeType.h 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGNodeType.h 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> macro(MovHint, NodeMustGenerate) \
</span><span class="cx"> macro(ZombieHint, NodeMustGenerate) \
</span><span class="cx"> macro(Phantom, NodeMustGenerate) \
</span><del>- macro(HardPhantom, NodeMustGenerate) /* Like Phantom, but we never remove any of its children. */ \
</del><ins>+ macro(MustGenerate, NodeMustGenerate) /* Utility node for making soem not-usually-NodeMustGenerate node become like NodeMustGenerate. */ \
</ins><span class="cx"> macro(Check, NodeMustGenerate) /* Used if we want just a type check but not liveness. Non-checking uses will be removed. */\
</span><span class="cx"> macro(Upsilon, NodeRelevantToOSR) \
</span><span class="cx"> macro(Phi, NodeRelevantToOSR) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGObjectAllocationSinkingPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -768,7 +768,7 @@
</span><span class="cx"> case MovHint:
</span><span class="cx"> case Phantom:
</span><span class="cx"> case Check:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case StoreBarrier:
</span><span class="cx"> case StoreBarrierWithNullCheck:
</span><span class="cx"> case PutHint:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPhantomCanonicalizationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPhantomCanonicalizationPhase.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPhantomCanonicalizationPhase.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGPhantomCanonicalizationPhase.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> namespace JSC { namespace DFG {
</span><span class="cx">
</span><span class="cx"> static const NodeFlags NodeNeedsPhantom = NodeMiscFlag1;
</span><del>-static const NodeFlags NodeNeedsHardPhantom = NodeMiscFlag2;
</del><ins>+static const NodeFlags NodeNeedsMustGenerate = NodeMiscFlag2;
</ins><span class="cx">
</span><span class="cx"> class PhantomCanonicalizationPhase : public Phase {
</span><span class="cx"> public:
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_graph.m_form == SSA);
</span><span class="cx">
</span><del>- m_graph.clearFlagsOnAllNodes(NodeNeedsPhantom | NodeNeedsHardPhantom | NodeRelevantToOSR);
</del><ins>+ m_graph.clearFlagsOnAllNodes(NodeNeedsPhantom | NodeNeedsMustGenerate | NodeRelevantToOSR);
</ins><span class="cx"> m_graph.mergeRelevantToOSR();
</span><span class="cx">
</span><span class="cx"> for (BlockIndex blockIndex = m_graph.numBlocks(); blockIndex--;) {
</span><span class="lines">@@ -63,13 +63,13 @@
</span><span class="cx"> unsigned targetIndex = 0;
</span><span class="cx"> while (sourceIndex < block->size()) {
</span><span class="cx"> Node* node = block->at(sourceIndex++);
</span><del>- if (node->op() == HardPhantom || node->op() == Phantom || node->op() == Check) {
</del><ins>+ if (node->op() == MustGenerate || node->op() == Phantom || node->op() == Check) {
</ins><span class="cx"> for (unsigned i = 0; i < AdjacencyList::Size; ++i) {
</span><span class="cx"> Edge edge = node->children.child(i);
</span><span class="cx"> if (!edge)
</span><span class="cx"> break;
</span><del>- if (node->op() == HardPhantom)
- edge->mergeFlags(NodeNeedsHardPhantom);
</del><ins>+ if (node->op() == MustGenerate)
+ edge->mergeFlags(NodeNeedsMustGenerate);
</ins><span class="cx"> if ((edge->flags() & NodeRelevantToOSR) && node->op() == Phantom) {
</span><span class="cx"> // A Phantom on a node that is RelevantToOSR means that we need to keep
</span><span class="cx"> // a Phantom on this node instead of just having a Check.
</span><span class="lines">@@ -101,9 +101,9 @@
</span><span class="cx">
</span><span class="cx"> for (unsigned nodeIndex = 0; nodeIndex < block->size(); ++nodeIndex) {
</span><span class="cx"> Node* node = block->at(nodeIndex);
</span><del>- if (node->flags() & NodeNeedsHardPhantom) {
</del><ins>+ if (node->flags() & NodeNeedsMustGenerate) {
</ins><span class="cx"> insertionSet.insertNode(
</span><del>- nodeIndex + 1, SpecNone, HardPhantom, node->origin, node->defaultEdge());
</del><ins>+ nodeIndex + 1, SpecNone, MustGenerate, node->origin, node->defaultEdge());
</ins><span class="cx"> } else if (node->flags() & NodeNeedsPhantom) {
</span><span class="cx"> insertionSet.insertNode(
</span><span class="cx"> nodeIndex + 1, SpecNone, Phantom, node->origin, node->defaultEdge());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPhantomRemovalPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPhantomRemovalPhase.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPhantomRemovalPhase.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGPhantomRemovalPhase.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case HardPhantom: {
</del><ins>+ case MustGenerate: {
</ins><span class="cx"> if (node->children.isEmpty()) {
</span><span class="cx"> m_graph.m_allocator.free(node);
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPredictionPropagationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -534,7 +534,7 @@
</span><span class="cx"> case InvalidationPoint:
</span><span class="cx"> case CheckInBounds:
</span><span class="cx"> case ValueToInt32:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case DoubleRep:
</span><span class="cx"> case ValueRep:
</span><span class="cx"> case Int52Rep:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSafeToExecuteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> case MovHint:
</span><span class="cx"> case ZombieHint:
</span><span class="cx"> case Phantom:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case Upsilon:
</span><span class="cx"> case Phi:
</span><span class="cx"> case Flush:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -4617,7 +4617,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Phantom:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case Check:
</span><span class="cx"> DFG_NODE_DO_TO_CHILDREN(m_jit.graph(), node, speculate);
</span><span class="cx"> noResult(node);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -4334,7 +4334,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Phantom:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case Check:
</span><span class="cx"> DFG_NODE_DO_TO_CHILDREN(m_jit.graph(), node, speculate);
</span><span class="cx"> noResult(node);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGTypeCheckHoistingPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGTypeCheckHoistingPhase.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGTypeCheckHoistingPhase.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGTypeCheckHoistingPhase.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> case GetIndexedPropertyStorage:
</span><span class="cx"> case GetTypedArrayByteOffset:
</span><span class="cx"> case Phantom:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case MovHint:
</span><span class="cx"> case MultiGetByOffset:
</span><span class="cx"> case MultiPutByOffset:
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> case GetArrayLength:
</span><span class="cx"> case GetIndexedPropertyStorage:
</span><span class="cx"> case Phantom:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case MovHint:
</span><span class="cx"> case MultiGetByOffset:
</span><span class="cx"> case MultiPutByOffset:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGVarargsForwardingPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGVarargsForwardingPhase.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGVarargsForwardingPhase.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/dfg/DFGVarargsForwardingPhase.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> switch (node->op()) {
</span><span class="cx"> case Phantom:
</span><span class="cx"> case Check:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case MovHint:
</span><span class="cx"> case PutHint:
</span><span class="cx"> case LoadVarargs:
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> switch (node->op()) {
</span><span class="cx"> case Phantom:
</span><span class="cx"> case Check:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case MovHint:
</span><span class="cx"> case PutHint:
</span><span class="cx"> // We don't need to change anything with these.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> case MovHint:
</span><span class="cx"> case ZombieHint:
</span><span class="cx"> case Phantom:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case Flush:
</span><span class="cx"> case PhantomLocal:
</span><span class="cx"> case SetArgument:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (183200 => 183201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-04-23 18:58:04 UTC (rev 183200)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-04-23 19:25:10 UTC (rev 183201)
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx"> compilePutStack();
</span><span class="cx"> break;
</span><span class="cx"> case Phantom:
</span><del>- case HardPhantom:
</del><ins>+ case MustGenerate:
</ins><span class="cx"> case Check:
</span><span class="cx"> compilePhantom();
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>