<!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>[183162] 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/183162">183162</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-04-22 19:36:08 -0700 (Wed, 22 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Nodes should have an optional epoch field
https://bugs.webkit.org/show_bug.cgi?id=144084
Reviewed by Ryosuke Niwa and Mark Lam.
This makes it easier to do epoch-based analyses on nodes. I plan to do just that in
https://bugs.webkit.org/show_bug.cgi?id=143735. Currently the epoch field is not yet
used.
* dfg/DFGCPSRethreadingPhase.cpp:
(JSC::DFG::CPSRethreadingPhase::canonicalizeGetLocalFor):
* dfg/DFGCSEPhase.cpp:
* dfg/DFGEpoch.h:
(JSC::DFG::Epoch::fromUnsigned):
(JSC::DFG::Epoch::toUnsigned):
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::clearReplacements):
(JSC::DFG::Graph::clearEpochs):
* dfg/DFGGraph.h:
(JSC::DFG::Graph::performSubstitutionForEdge):
* dfg/DFGNode.h:
(JSC::DFG::Node::Node):
(JSC::DFG::Node::replaceWith):
(JSC::DFG::Node::replacement):
(JSC::DFG::Node::setReplacement):
(JSC::DFG::Node::epoch):
(JSC::DFG::Node::setEpoch):
* dfg/DFGSSAConversionPhase.cpp:
(JSC::DFG::SSAConversionPhase::run):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCPSRethreadingPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGCPSRethreadingPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCSEPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGEpochh">trunk/Source/JavaScriptCore/dfg/DFGEpoch.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphcpp">trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGGraphh">trunk/Source/JavaScriptCore/dfg/DFGGraph.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeh">trunk/Source/JavaScriptCore/dfg/DFGNode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSSAConversionPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGSSAConversionPhase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183161 => 183162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-23 02:29:14 UTC (rev 183161)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-23 02:36:08 UTC (rev 183162)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-04-22 Filip Pizlo <fpizlo@apple.com>
+
+ Nodes should have an optional epoch field
+ https://bugs.webkit.org/show_bug.cgi?id=144084
+
+ Reviewed by Ryosuke Niwa and Mark Lam.
+
+ This makes it easier to do epoch-based analyses on nodes. I plan to do just that in
+ https://bugs.webkit.org/show_bug.cgi?id=143735. Currently the epoch field is not yet
+ used.
+
+ * dfg/DFGCPSRethreadingPhase.cpp:
+ (JSC::DFG::CPSRethreadingPhase::canonicalizeGetLocalFor):
+ * dfg/DFGCSEPhase.cpp:
+ * dfg/DFGEpoch.h:
+ (JSC::DFG::Epoch::fromUnsigned):
+ (JSC::DFG::Epoch::toUnsigned):
+ * dfg/DFGGraph.cpp:
+ (JSC::DFG::Graph::clearReplacements):
+ (JSC::DFG::Graph::clearEpochs):
+ * dfg/DFGGraph.h:
+ (JSC::DFG::Graph::performSubstitutionForEdge):
+ * dfg/DFGNode.h:
+ (JSC::DFG::Node::Node):
+ (JSC::DFG::Node::replaceWith):
+ (JSC::DFG::Node::replacement):
+ (JSC::DFG::Node::setReplacement):
+ (JSC::DFG::Node::epoch):
+ (JSC::DFG::Node::setEpoch):
+ * dfg/DFGSSAConversionPhase.cpp:
+ (JSC::DFG::SSAConversionPhase::run):
+
</ins><span class="cx"> 2015-04-22 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix assertion failure and race condition in Options::dumpSourceAtDFGTime().
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCPSRethreadingPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCPSRethreadingPhase.cpp (183161 => 183162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCPSRethreadingPhase.cpp 2015-04-23 02:29:14 UTC (rev 183161)
+++ trunk/Source/JavaScriptCore/dfg/DFGCPSRethreadingPhase.cpp 2015-04-23 02:36:08 UTC (rev 183162)
</span><span class="lines">@@ -194,12 +194,12 @@
</span><span class="cx">
</span><span class="cx"> if (otherNode->op() == GetLocal) {
</span><span class="cx"> // Replace all references to this GetLocal with otherNode.
</span><del>- node->replacement = otherNode;
</del><ins>+ node->setReplacement(otherNode);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(otherNode->op() == SetLocal);
</span><del>- node->replacement = otherNode->child1().node();
</del><ins>+ node->setReplacement(otherNode->child1().node());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCSEPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp (183161 => 183162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp 2015-04-23 02:29:14 UTC (rev 183161)
+++ trunk/Source/JavaScriptCore/dfg/DFGCSEPhase.cpp 2015-04-23 02:36:08 UTC (rev 183162)
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_node->op() == Identity) {
</span><span class="cx"> m_node->convertToCheck();
</span><del>- m_node->replacement = m_node->child1().node();
</del><ins>+ m_node->setReplacement(m_node->child1().node());
</ins><span class="cx"> m_changed = true;
</span><span class="cx"> } else {
</span><span class="cx"> // This rule only makes sense for local CSE, since in SSA form we have already
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_node->op() == Identity) {
</span><span class="cx"> m_node->convertToCheck();
</span><del>- m_node->replacement = m_node->child1().node();
</del><ins>+ m_node->setReplacement(m_node->child1().node());
</ins><span class="cx"> m_changed = true;
</span><span class="cx"> } else
</span><span class="cx"> clobberize(m_graph, m_node, *this);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGEpochh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGEpoch.h (183161 => 183162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGEpoch.h 2015-04-23 02:29:14 UTC (rev 183161)
+++ trunk/Source/JavaScriptCore/dfg/DFGEpoch.h 2015-04-23 02:36:08 UTC (rev 183162)
</span><span class="lines">@@ -41,6 +41,18 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static Epoch fromUnsigned(unsigned value)
+ {
+ Epoch result;
+ result.m_epoch = value;
+ return result;
+ }
+
+ unsigned toUnsigned() const
+ {
+ return m_epoch;
+ }
+
</ins><span class="cx"> static Epoch first()
</span><span class="cx"> {
</span><span class="cx"> Epoch result;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp (183161 => 183162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2015-04-23 02:29:14 UTC (rev 183161)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp 2015-04-23 02:36:08 UTC (rev 183162)
</span><span class="lines">@@ -832,12 +832,25 @@
</span><span class="cx"> if (!block)
</span><span class="cx"> continue;
</span><span class="cx"> for (unsigned phiIndex = block->phis.size(); phiIndex--;)
</span><del>- block->phis[phiIndex]->replacement = 0;
</del><ins>+ block->phis[phiIndex]->setReplacement(nullptr);
</ins><span class="cx"> for (unsigned nodeIndex = block->size(); nodeIndex--;)
</span><del>- block->at(nodeIndex)->replacement = 0;
</del><ins>+ block->at(nodeIndex)->setReplacement(nullptr);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Graph::clearEpochs()
+{
+ for (BlockIndex blockIndex = numBlocks(); blockIndex--;) {
+ BasicBlock* block = m_blocks[blockIndex].get();
+ if (!block)
+ continue;
+ for (unsigned phiIndex = block->phis.size(); phiIndex--;)
+ block->phis[phiIndex]->setEpoch(Epoch());
+ for (unsigned nodeIndex = block->size(); nodeIndex--;)
+ block->at(nodeIndex)->setEpoch(Epoch());
+ }
+}
+
</ins><span class="cx"> void Graph::initializeNodeOwners()
</span><span class="cx"> {
</span><span class="cx"> for (BlockIndex blockIndex = numBlocks(); blockIndex--;) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGGraphh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGGraph.h (183161 => 183162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2015-04-23 02:29:14 UTC (rev 183161)
+++ trunk/Source/JavaScriptCore/dfg/DFGGraph.h 2015-04-23 02:36:08 UTC (rev 183162)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Check if there is any replacement.
</span><del>- Node* replacement = child->replacement;
</del><ins>+ Node* replacement = child->replacement();
</ins><span class="cx"> if (!replacement)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -563,6 +563,7 @@
</span><span class="cx"> void clearFlagsOnAllNodes(NodeFlags);
</span><span class="cx">
</span><span class="cx"> void clearReplacements();
</span><ins>+ void clearEpochs();
</ins><span class="cx"> void initializeNodeOwners();
</span><span class="cx">
</span><span class="cx"> BlockList blocksInPreOrder();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNode.h (183161 => 183162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNode.h 2015-04-23 02:29:14 UTC (rev 183161)
+++ trunk/Source/JavaScriptCore/dfg/DFGNode.h 2015-04-23 02:36:08 UTC (rev 183162)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "DFGArithMode.h"
</span><span class="cx"> #include "DFGArrayMode.h"
</span><span class="cx"> #include "DFGCommon.h"
</span><ins>+#include "DFGEpoch.h"
</ins><span class="cx"> #include "DFGLazyJSValue.h"
</span><span class="cx"> #include "DFGNodeFlags.h"
</span><span class="cx"> #include "DFGNodeOrigin.h"
</span><span class="lines">@@ -245,9 +246,9 @@
</span><span class="cx"> , m_virtualRegister(VirtualRegister())
</span><span class="cx"> , m_refCount(1)
</span><span class="cx"> , m_prediction(SpecNone)
</span><del>- , replacement(nullptr)
</del><span class="cx"> , owner(nullptr)
</span><span class="cx"> {
</span><ins>+ m_misc.replacement = nullptr;
</ins><span class="cx"> setOpAndDefaultFlags(op);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -260,9 +261,9 @@
</span><span class="cx"> , m_prediction(SpecNone)
</span><span class="cx"> , m_opInfo(0)
</span><span class="cx"> , m_opInfo2(0)
</span><del>- , replacement(nullptr)
</del><span class="cx"> , owner(nullptr)
</span><span class="cx"> {
</span><ins>+ m_misc.replacement = nullptr;
</ins><span class="cx"> setOpAndDefaultFlags(op);
</span><span class="cx"> ASSERT(!(m_flags & NodeHasVarArgs));
</span><span class="cx"> }
</span><span class="lines">@@ -276,9 +277,9 @@
</span><span class="cx"> , m_prediction(SpecNone)
</span><span class="cx"> , m_opInfo(0)
</span><span class="cx"> , m_opInfo2(0)
</span><del>- , replacement(nullptr)
</del><span class="cx"> , owner(nullptr)
</span><span class="cx"> {
</span><ins>+ m_misc.replacement = nullptr;
</ins><span class="cx"> setOpAndDefaultFlags(op);
</span><span class="cx"> setResult(result);
</span><span class="cx"> ASSERT(!(m_flags & NodeHasVarArgs));
</span><span class="lines">@@ -293,9 +294,9 @@
</span><span class="cx"> , m_prediction(SpecNone)
</span><span class="cx"> , m_opInfo(imm.m_value)
</span><span class="cx"> , m_opInfo2(0)
</span><del>- , replacement(nullptr)
</del><span class="cx"> , owner(nullptr)
</span><span class="cx"> {
</span><ins>+ m_misc.replacement = nullptr;
</ins><span class="cx"> setOpAndDefaultFlags(op);
</span><span class="cx"> ASSERT(!(m_flags & NodeHasVarArgs));
</span><span class="cx"> }
</span><span class="lines">@@ -309,9 +310,9 @@
</span><span class="cx"> , m_prediction(SpecNone)
</span><span class="cx"> , m_opInfo(imm.m_value)
</span><span class="cx"> , m_opInfo2(0)
</span><del>- , replacement(nullptr)
</del><span class="cx"> , owner(nullptr)
</span><span class="cx"> {
</span><ins>+ m_misc.replacement = nullptr;
</ins><span class="cx"> setOpAndDefaultFlags(op);
</span><span class="cx"> setResult(result);
</span><span class="cx"> ASSERT(!(m_flags & NodeHasVarArgs));
</span><span class="lines">@@ -326,9 +327,9 @@
</span><span class="cx"> , m_prediction(SpecNone)
</span><span class="cx"> , m_opInfo(imm1.m_value)
</span><span class="cx"> , m_opInfo2(imm2.m_value)
</span><del>- , replacement(nullptr)
</del><span class="cx"> , owner(nullptr)
</span><span class="cx"> {
</span><ins>+ m_misc.replacement = nullptr;
</ins><span class="cx"> setOpAndDefaultFlags(op);
</span><span class="cx"> ASSERT(!(m_flags & NodeHasVarArgs));
</span><span class="cx"> }
</span><span class="lines">@@ -342,9 +343,9 @@
</span><span class="cx"> , m_prediction(SpecNone)
</span><span class="cx"> , m_opInfo(imm1.m_value)
</span><span class="cx"> , m_opInfo2(imm2.m_value)
</span><del>- , replacement(nullptr)
</del><span class="cx"> , owner(nullptr)
</span><span class="cx"> {
</span><ins>+ m_misc.replacement = nullptr;
</ins><span class="cx"> setOpAndDefaultFlags(op);
</span><span class="cx"> ASSERT(m_flags & NodeHasVarArgs);
</span><span class="cx"> }
</span><span class="lines">@@ -425,7 +426,7 @@
</span><span class="cx"> void replaceWith(Node* other)
</span><span class="cx"> {
</span><span class="cx"> convertToPhantom();
</span><del>- replacement = other;
</del><ins>+ setReplacement(other);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void convertToIdentity();
</span><span class="lines">@@ -1936,6 +1937,26 @@
</span><span class="cx"> return reinterpret_cast<BasicBlockLocation*>(m_opInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Node* replacement() const
+ {
+ return m_misc.replacement;
+ }
+
+ void setReplacement(Node* replacement)
+ {
+ m_misc.replacement = replacement;
+ }
+
+ Epoch epoch() const
+ {
+ return Epoch::fromUnsigned(m_misc.epoch);
+ }
+
+ void setEpoch(Epoch epoch)
+ {
+ m_misc.epoch = epoch.toUnsigned();
+ }
+
</ins><span class="cx"> void dumpChildren(PrintStream& out)
</span><span class="cx"> {
</span><span class="cx"> if (!child1())
</span><span class="lines">@@ -1979,12 +2000,17 @@
</span><span class="cx"> // will tell you which basic block a node belongs to. You cannot rely on this persisting
</span><span class="cx"> // across transformations unless you do the maintenance work yourself. Other phases use
</span><span class="cx"> // Node::replacement, but they do so manually: first you do Graph::clearReplacements()
</span><del>- // and then you set, and use, replacement's yourself.
</del><ins>+ // and then you set, and use, replacement's yourself. Same thing for epoch.
</ins><span class="cx"> //
</span><span class="cx"> // Bottom line: don't use these fields unless you initialize them yourself, or by
</span><span class="cx"> // calling some appropriate methods that initialize them the way you want. Otherwise,
</span><span class="cx"> // these fields are meaningless.
</span><del>- Node* replacement;
</del><ins>+private:
+ union {
+ Node* replacement;
+ unsigned epoch;
+ } m_misc;
+public:
</ins><span class="cx"> BasicBlock* owner;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSSAConversionPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSSAConversionPhase.cpp (183161 => 183162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSSAConversionPhase.cpp 2015-04-23 02:29:14 UTC (rev 183161)
+++ trunk/Source/JavaScriptCore/dfg/DFGSSAConversionPhase.cpp 2015-04-23 02:36:08 UTC (rev 183162)
</span><span class="lines">@@ -227,13 +227,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* node = def->value();
</span><del>- if (node->replacement) {
</del><ins>+ if (node->replacement()) {
</ins><span class="cx"> // This will occur when a SetLocal had a GetLocal as its source. The
</span><span class="cx"> // GetLocal would get replaced with an actual SSA value by the time we get
</span><span class="cx"> // here. Note that the SSA value with which the GetLocal got replaced
</span><span class="cx"> // would not in turn have a replacement.
</span><del>- node = node->replacement;
- ASSERT(!node->replacement);
</del><ins>+ node = node->replacement();
+ ASSERT(!node->replacement());
</ins><span class="cx"> }
</span><span class="cx"> if (verbose)
</span><span class="cx"> dataLog("Mapping: ", VirtualRegister(valueForOperand.operandForIndex(i)), " -> ", node, "\n");
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> node->convertToPhantom();
</span><span class="cx"> if (verbose)
</span><span class="cx"> dataLog("Replacing node ", node, " with ", valueForOperand.operand(variable->local()), "\n");
</span><del>- node->replacement = valueForOperand.operand(variable->local());
</del><ins>+ node->setReplacement(valueForOperand.operand(variable->local()));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>