<!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>[184534] 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/184534">184534</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-18 18:06:33 -0700 (Mon, 18 May 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/184397">r184397</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="#branchessafari6011322branchSourceJavaScriptCoredfgDFGSpeculativeJITcpp">branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceJavaScriptCoredfgDFGSpeculativeJITh">branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h</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>
</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 (184533 => 184534)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/JavaScriptCore/ChangeLog        2015-05-19 01:06:06 UTC (rev 184533)
+++ branches/safari-601.1.32.2-branch/Source/JavaScriptCore/ChangeLog        2015-05-19 01:06:33 UTC (rev 184534)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-05-18  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r184397. rdar://problem/20979071
+
+    2015-05-14  Filip Pizlo  &lt;fpizlo@apple.com&gt;
+
+            Remove unused constant-base and constant-value store barrier code in the DFG
+            https://bugs.webkit.org/show_bug.cgi?id=145039
+
+            Reviewed by Andreas Kling.
+
+            Just killing dead code.
+
+            * dfg/DFGSpeculativeJIT.cpp:
+            (JSC::DFG::SpeculativeJIT::storeToWriteBarrierBuffer): Deleted.
+            (JSC::DFG::SpeculativeJIT::writeBarrier): Deleted.
+            * dfg/DFGSpeculativeJIT.h:
+            * dfg/DFGSpeculativeJIT32_64.cpp:
+            (JSC::DFG::SpeculativeJIT::writeBarrier):
+            * dfg/DFGSpeculativeJIT64.cpp:
+            (JSC::DFG::SpeculativeJIT::writeBarrier):
+
+2015-05-18  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
</ins><span class="cx">         Merge r184367. rdar://problem/20979071
</span><span class="cx"> 
</span><span class="cx">     2015-05-14  Filip Pizlo  &lt;fpizlo@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6011322branchSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (184533 => 184534)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp        2015-05-19 01:06:06 UTC (rev 184533)
+++ branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp        2015-05-19 01:06:33 UTC (rev 184534)
</span><span class="lines">@@ -6104,42 +6104,6 @@
</span><span class="cx">     done.link(&amp;m_jit);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void SpeculativeJIT::storeToWriteBarrierBuffer(JSCell* cell, GPRReg scratch1, GPRReg scratch2)
-{
-    ASSERT(scratch1 != scratch2);
-    WriteBarrierBuffer* writeBarrierBuffer = &amp;m_jit.vm()-&gt;heap.m_writeBarrierBuffer;
-    m_jit.move(TrustedImmPtr(writeBarrierBuffer), scratch1);
-    m_jit.load32(MacroAssembler::Address(scratch1, WriteBarrierBuffer::currentIndexOffset()), scratch2);
-    JITCompiler::Jump needToFlush = m_jit.branch32(MacroAssembler::AboveOrEqual, scratch2, MacroAssembler::Address(scratch1, WriteBarrierBuffer::capacityOffset()));
-
-    m_jit.add32(TrustedImm32(1), scratch2);
-    m_jit.store32(scratch2, MacroAssembler::Address(scratch1, WriteBarrierBuffer::currentIndexOffset()));
-
-    m_jit.loadPtr(MacroAssembler::Address(scratch1, WriteBarrierBuffer::bufferOffset()), scratch1);
-    // We use an offset of -sizeof(void*) because we already added 1 to scratch2.
-    m_jit.storePtr(TrustedImmPtr(cell), MacroAssembler::BaseIndex(scratch1, scratch2, MacroAssembler::ScalePtr, static_cast&lt;int32_t&gt;(-sizeof(void*))));
-
-    JITCompiler::Jump done = m_jit.jump();
-    needToFlush.link(&amp;m_jit);
-
-    // Call C slow path
-    silentSpillAllRegisters(InvalidGPRReg);
-    callOperation(operationFlushWriteBarrierBuffer, cell);
-    silentFillAllRegisters(InvalidGPRReg);
-
-    done.link(&amp;m_jit);
-}
-
-void SpeculativeJIT::writeBarrier(GPRReg ownerGPR, JSCell* value, GPRReg scratch1, GPRReg scratch2)
-{
-    if (Heap::isMarked(value))
-        return;
-
-    JITCompiler::Jump ownerIsRememberedOrInEden = m_jit.jumpIfIsRememberedOrInEden(ownerGPR);
-    storeToWriteBarrierBuffer(ownerGPR, scratch1, scratch2);
-    ownerIsRememberedOrInEden.link(&amp;m_jit);
-}
-
</del><span class="cx"> void SpeculativeJIT::writeBarrier(GPRReg ownerGPR, GPRReg scratch1, GPRReg scratch2)
</span><span class="cx"> {
</span><span class="cx">     JITCompiler::Jump ownerIsRememberedOrInEden = m_jit.jumpIfIsRememberedOrInEden(ownerGPR);
</span></span></pre></div>
<a id="branchessafari6011322branchSourceJavaScriptCoredfgDFGSpeculativeJITh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h (184533 => 184534)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h        2015-05-19 01:06:06 UTC (rev 184533)
+++ branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h        2015-05-19 01:06:33 UTC (rev 184534)
</span><span class="lines">@@ -294,10 +294,8 @@
</span><span class="cx">     void storeToWriteBarrierBuffer(JSCell*, GPRReg scratch1, GPRReg scratch2);
</span><span class="cx"> 
</span><span class="cx">     void writeBarrier(GPRReg owner, GPRReg scratch1, GPRReg scratch2);
</span><del>-    void writeBarrier(GPRReg owner, JSCell* value, GPRReg scratch1, GPRReg scratch2);
</del><span class="cx"> 
</span><span class="cx">     void writeBarrier(GPRReg owner, GPRReg value, Edge valueUse, GPRReg scratch1, GPRReg scratch2);
</span><del>-    void writeBarrier(JSCell* owner, GPRReg value, Edge valueUse, GPRReg scratch1, GPRReg scratch2);
</del><span class="cx"> #endif
</span><span class="cx">     void compileStoreBarrier(Node*);
</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 (184533 => 184534)</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:06:06 UTC (rev 184533)
+++ branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp        2015-05-19 01:06:33 UTC (rev 184534)
</span><span class="lines">@@ -4628,20 +4628,6 @@
</span><span class="cx">     if (!isKnownCell(valueUse.node()))
</span><span class="cx">         isNotCell.link(&amp;m_jit);
</span><span class="cx"> }
</span><del>-
-void SpeculativeJIT::writeBarrier(JSCell* owner, GPRReg valueTagGPR, Edge valueUse, GPRReg scratch1, GPRReg scratch2)
-{
-    JITCompiler::Jump isNotCell;
-    if (!isKnownCell(valueUse.node()))
-        isNotCell = m_jit.branch32(JITCompiler::NotEqual, valueTagGPR, JITCompiler::TrustedImm32(JSValue::CellTag));
-
-    JITCompiler::Jump ownerIsRememberedOrInEden = m_jit.jumpIfIsRememberedOrInEden(owner);
-    storeToWriteBarrierBuffer(owner, scratch1, scratch2);
-    ownerIsRememberedOrInEden.link(&amp;m_jit);
-
-    if (!isKnownCell(valueUse.node()))
-        isNotCell.link(&amp;m_jit);
-}
</del><span class="cx"> #endif // ENABLE(GGC)
</span><span class="cx"> 
</span><span class="cx"> void SpeculativeJIT::moveTrueTo(GPRReg gpr)
</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 (184533 => 184534)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp        2015-05-19 01:06:06 UTC (rev 184533)
+++ branches/safari-601.1.32.2-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp        2015-05-19 01:06:33 UTC (rev 184534)
</span><span class="lines">@@ -4724,20 +4724,6 @@
</span><span class="cx">     if (!isKnownCell(valueUse.node()))
</span><span class="cx">         isNotCell.link(&amp;m_jit);
</span><span class="cx"> }
</span><del>-
-void SpeculativeJIT::writeBarrier(JSCell* owner, GPRReg valueGPR, Edge valueUse, GPRReg scratch1, GPRReg scratch2)
-{
-    JITCompiler::Jump isNotCell;
-    if (!isKnownCell(valueUse.node()))
-        isNotCell = m_jit.branchIfNotCell(JSValueRegs(valueGPR));
-    
-    JITCompiler::Jump ownerIsRememberedOrInEden = m_jit.jumpIfIsRememberedOrInEden(owner);
-    storeToWriteBarrierBuffer(owner, scratch1, scratch2);
-    ownerIsRememberedOrInEden.link(&amp;m_jit);
-
-    if (!isKnownCell(valueUse.node()))
-        isNotCell.link(&amp;m_jit);
-}
</del><span class="cx"> #endif // ENABLE(GGC)
</span><span class="cx"> 
</span><span class="cx"> void SpeculativeJIT::moveTrueTo(GPRReg gpr)
</span></span></pre>
</div>
</div>

</body>
</html>