<!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>[165435] 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/165435">165435</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-03-10 23:57:43 -0700 (Mon, 10 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/165407">r165407</a>): DoYouEvenBench crashes in DRT
https://bugs.webkit.org/show_bug.cgi?id=130066
Reviewed by Geoffrey Garen.
The baseline JIT does a conditional store barrier for the put_by_id, but we need
an unconditional store barrier so that we cover the butterfly case as well in emitPutTransitionStub.
* jit/JIT.h:
* jit/JITPropertyAccess.cpp:
(JSC::JIT::emit_op_put_by_id):
(JSC::JIT::emitWriteBarrier):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITh">trunk/Source/JavaScriptCore/jit/JIT.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccesscpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (165434 => 165435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-11 06:25:23 UTC (rev 165434)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-11 06:57:43 UTC (rev 165435)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-10 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ REGRESSION(r165407): DoYouEvenBench crashes in DRT
+ https://bugs.webkit.org/show_bug.cgi?id=130066
+
+ Reviewed by Geoffrey Garen.
+
+ The baseline JIT does a conditional store barrier for the put_by_id, but we need
+ an unconditional store barrier so that we cover the butterfly case as well in emitPutTransitionStub.
+
+ * jit/JIT.h:
+ * jit/JITPropertyAccess.cpp:
+ (JSC::JIT::emit_op_put_by_id):
+ (JSC::JIT::emitWriteBarrier):
+
</ins><span class="cx"> 2014-03-10 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Resurrect bit-rotted JIT::probe() mechanism.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.h (165434 => 165435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.h 2014-03-11 06:25:23 UTC (rev 165434)
+++ trunk/Source/JavaScriptCore/jit/JIT.h 2014-03-11 06:57:43 UTC (rev 165435)
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> void addStructureTransitionCheck(JSCell*, Structure*, StructureStubInfo*, JumpList& failureCases, RegisterID scratch);
</span><span class="cx"> void testPrototype(JSValue, JumpList& failureCases, StructureStubInfo*);
</span><span class="cx">
</span><del>- enum WriteBarrierMode { UnconditionalWriteBarrier, ShouldFilterValue, ShouldFilterBaseAndValue };
</del><ins>+ enum WriteBarrierMode { UnconditionalWriteBarrier, ShouldFilterBase, ShouldFilterValue, ShouldFilterBaseAndValue };
</ins><span class="cx"> // value register in write barrier is used before any scratch registers
</span><span class="cx"> // so may safely be the same as either of the scratch registers.
</span><span class="cx"> void emitWriteBarrier(unsigned owner, unsigned value, WriteBarrierMode);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (165434 => 165435)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2014-03-11 06:25:23 UTC (rev 165434)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2014-03-11 06:57:43 UTC (rev 165435)
</span><span class="lines">@@ -554,7 +554,7 @@
</span><span class="cx"> int valueVReg = currentInstruction[3].u.operand;
</span><span class="cx"> unsigned direct = currentInstruction[8].u.operand;
</span><span class="cx">
</span><del>- emitWriteBarrier(baseVReg, valueVReg, ShouldFilterBaseAndValue);
</del><ins>+ emitWriteBarrier(baseVReg, valueVReg, ShouldFilterBase);
</ins><span class="cx">
</span><span class="cx"> // In order to be able to patch both the Structure, and the object offset, we store one pointer,
</span><span class="cx"> // to just after the arguments have been loaded into registers 'hotPathBegin', and we generate code
</span><span class="lines">@@ -883,21 +883,22 @@
</span><span class="cx"> void JIT::emitWriteBarrier(unsigned owner, unsigned value, WriteBarrierMode mode)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(GGC)
</span><del>- emitGetVirtualRegister(value, regT0);
</del><span class="cx"> Jump valueNotCell;
</span><del>- if (mode == ShouldFilterValue || mode == ShouldFilterBaseAndValue)
</del><ins>+ if (mode == ShouldFilterValue || mode == ShouldFilterBaseAndValue) {
+ emitGetVirtualRegister(value, regT0);
</ins><span class="cx"> valueNotCell = branchTest64(NonZero, regT0, tagMaskRegister);
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> emitGetVirtualRegister(owner, regT0);
</span><span class="cx"> Jump ownerNotCell;
</span><del>- if (mode == ShouldFilterBaseAndValue)
</del><ins>+ if (mode == ShouldFilterBaseAndValue || mode == ShouldFilterBase)
</ins><span class="cx"> ownerNotCell = branchTest64(NonZero, regT0, tagMaskRegister);
</span><span class="cx">
</span><span class="cx"> Jump ownerNotMarkedOrAlreadyRemembered = checkMarkByte(regT0);
</span><span class="cx"> callOperation(operationUnconditionalWriteBarrier, regT0);
</span><span class="cx"> ownerNotMarkedOrAlreadyRemembered.link(this);
</span><span class="cx">
</span><del>- if (mode == ShouldFilterBaseAndValue)
</del><ins>+ if (mode == ShouldFilterBaseAndValue || mode == ShouldFilterBase)
</ins><span class="cx"> ownerNotCell.link(this);
</span><span class="cx"> if (mode == ShouldFilterValue || mode == ShouldFilterBaseAndValue)
</span><span class="cx"> valueNotCell.link(this);
</span></span></pre>
</div>
</div>
</body>
</html>