<!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>[184533] branches/safari-601.1.32.2-branch/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/184533">184533</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-18 18:06:06 -0700 (Mon, 18 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/184367">r184367</a>. rdar://problem/20979071</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011322branchSourceJavaScriptCoreChangeLog">branches/safari-601.1.32.2-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceJavaScriptCoredfgDFGByteCodeParsercpp">branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceJavaScriptCoredfgDFGClobberizeh">branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGClobberize.h</a></li>
<li><a href="#branchessafari6011322branchSourceJavaScriptCoredfgDFGFixupPhasecpp">branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">branches/safari-601.1.32.2-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011322branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/JavaScriptCore/ChangeLog (184532 => 184533)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/JavaScriptCore/ChangeLog 2015-05-19 01:00:31 UTC (rev 184532)
+++ branches/safari-601.1.32.2-branch/Source/JavaScriptCore/ChangeLog 2015-05-19 01:06:06 UTC (rev 184533)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184367. rdar://problem/20979071
+
+ 2015-05-14 Filip Pizlo <fpizlo@apple.com>
+
+ PutGlobalVar should reference the global object it's storing into
+ https://bugs.webkit.org/show_bug.cgi?id=145036
+
+ Reviewed by Michael Saboff.
+
+ This makes it easier to reason about store barrier insertion and elimination. This changes
+ the format of PutGlobalVar so that child1 is the global object and child2 is the value.
+ Previously it just had child1, and that was the value.
+
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ * dfg/DFGClobberize.h:
+ (JSC::DFG::clobberize):
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compilePutGlobalVar):
+
+2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge custom patch. rdar://problem/20950052
</span><span class="cx">
</span><span class="cx"> 2015-05-15 Dean Jackson <dino@apple.com>
</span></span></pre></div>
<a id="branchessafari6011322branchSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (184532 => 184533)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-05-19 01:00:31 UTC (rev 184532)
+++ branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-05-19 01:06:06 UTC (rev 184533)
</span><span class="lines">@@ -3123,10 +3123,11 @@
</span><span class="cx">
</span><span class="cx"> case op_init_global_const: {
</span><span class="cx"> Node* value = get(VirtualRegister(currentInstruction[2].u.operand));
</span><ins>+ JSGlobalObject* globalObject = m_inlineStackTop->m_codeBlock->globalObject();
</ins><span class="cx"> addToGraph(
</span><span class="cx"> PutGlobalVar,
</span><del>- OpInfo(m_inlineStackTop->m_codeBlock->globalObject()->assertVariableIsInThisObject(currentInstruction[1].u.variablePointer)),
- value);
</del><ins>+ OpInfo(globalObject->assertVariableIsInThisObject(currentInstruction[1].u.variablePointer)),
+ weakJSConstant(globalObject), value);
</ins><span class="cx"> NEXT_OPCODE(op_init_global_const);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3638,7 +3639,7 @@
</span><span class="cx"> ASSERT_UNUSED(entry, watchpoints == entry.watchpointSet());
</span><span class="cx"> }
</span><span class="cx"> Node* valueNode = get(VirtualRegister(value));
</span><del>- addToGraph(PutGlobalVar, OpInfo(operand), valueNode);
</del><ins>+ addToGraph(PutGlobalVar, OpInfo(operand), weakJSConstant(globalObject), valueNode);
</ins><span class="cx"> if (watchpoints && watchpoints->state() != IsInvalidated) {
</span><span class="cx"> // Must happen after the store. See comment for GetGlobalVar.
</span><span class="cx"> addToGraph(NotifyWrite, OpInfo(watchpoints));
</span></span></pre></div>
<a id="branchessafari6011322branchSourceJavaScriptCoredfgDFGClobberizeh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGClobberize.h (184532 => 184533)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGClobberize.h 2015-05-19 01:00:31 UTC (rev 184532)
+++ branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGClobberize.h 2015-05-19 01:06:06 UTC (rev 184533)
</span><span class="lines">@@ -832,7 +832,7 @@
</span><span class="cx">
</span><span class="cx"> case PutGlobalVar:
</span><span class="cx"> write(AbstractHeap(Absolute, node->variablePointer()));
</span><del>- def(HeapLocation(GlobalVariableLoc, AbstractHeap(Absolute, node->variablePointer())), node->child1().node());
</del><ins>+ def(HeapLocation(GlobalVariableLoc, AbstractHeap(Absolute, node->variablePointer())), node->child2().node());
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> case NewArray:
</span></span></pre></div>
<a id="branchessafari6011322branchSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (184532 => 184533)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-05-19 01:00:31 UTC (rev 184532)
+++ branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-05-19 01:06:06 UTC (rev 184533)
</span><span class="lines">@@ -1055,9 +1055,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case PutGlobalVar: {
</span><del>- Node* globalObjectNode = m_insertionSet.insertNode(
- m_indexInBlock, SpecNone, JSConstant, node->origin,
- OpInfo(m_graph.freeze(m_graph.globalObjectFor(node->origin.semantic))));
</del><ins>+ fixEdge<CellUse>(node->child1());
</ins><span class="cx"> speculateForBarrier(node->child2());
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6011322branchSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (184532 => 184533)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-05-19 01:00:31 UTC (rev 184532)
+++ branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-05-19 01:06:06 UTC (rev 184533)
</span><span class="lines">@@ -3966,7 +3966,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case PutGlobalVar: {
</span><del>- JSValueOperand value(this, node->child1());
</del><ins>+ JSValueOperand value(this, node->child2());
</ins><span class="cx">
</span><span class="cx"> // FIXME: if we happen to have a spare register - and _ONLY_ if we happen to have
</span><span class="cx"> // a spare register - a good optimization would be to put the register pointer into
</span></span></pre></div>
<a id="branchessafari6011322branchSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (184532 => 184533)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-05-19 01:00:31 UTC (rev 184532)
+++ branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-05-19 01:06:06 UTC (rev 184533)
</span><span class="lines">@@ -4005,7 +4005,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case PutGlobalVar: {
</span><del>- JSValueOperand value(this, node->child1());
</del><ins>+ JSValueOperand value(this, node->child2());
</ins><span class="cx">
</span><span class="cx"> m_jit.store64(value.gpr(), node->variablePointer());
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011322branchSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (184532 => 184533)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-05-19 01:00:31 UTC (rev 184532)
+++ branches/safari-601.1.32.2-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-05-19 01:06:06 UTC (rev 184533)
</span><span class="lines">@@ -3852,7 +3852,7 @@
</span><span class="cx"> void compilePutGlobalVar()
</span><span class="cx"> {
</span><span class="cx"> m_out.store64(
</span><del>- lowJSValue(m_node->child1()), m_out.absolute(m_node->variablePointer()));
</del><ins>+ lowJSValue(m_node->child2()), m_out.absolute(m_node->variablePointer()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileNotifyWrite()
</span></span></pre>
</div>
</div>
</body>
</html>