<!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>[169428] 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/169428">169428</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-05-28 11:59:38 -0700 (Wed, 28 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Arrayify neglects to inform the clobberizer that it might fire watchpoints
https://bugs.webkit.org/show_bug.cgi?id=133340
Reviewed by Mark Lam.
* dfg/DFGClobberize.h:
(JSC::DFG::clobberize): Be honest.
* llint/LowLevelInterpreter32_64.asm: Profile the object, not its structure.
* tests/stress/arrayify-fires-watchpoint.js: Added.
(foo):
(test):
(makeObjectArray):
* tests/stress/arrayify-structure-bad-test.js: Added.
(foo):
(test):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGClobberizeh">trunk/Source/JavaScriptCore/dfg/DFGClobberize.h</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrayifyfireswatchpointjs">trunk/Source/JavaScriptCore/tests/stress/arrayify-fires-watchpoint.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrayifystructurebadtestjs">trunk/Source/JavaScriptCore/tests/stress/arrayify-structure-bad-test.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (169427 => 169428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-05-28 18:31:28 UTC (rev 169427)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-05-28 18:59:38 UTC (rev 169428)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-27 Filip Pizlo <fpizlo@apple.com>
+
+ Arrayify neglects to inform the clobberizer that it might fire watchpoints
+ https://bugs.webkit.org/show_bug.cgi?id=133340
+
+ Reviewed by Mark Lam.
+
+ * dfg/DFGClobberize.h:
+ (JSC::DFG::clobberize): Be honest.
+ * llint/LowLevelInterpreter32_64.asm: Profile the object, not its structure.
+ * tests/stress/arrayify-fires-watchpoint.js: Added.
+ (foo):
+ (test):
+ (makeObjectArray):
+ * tests/stress/arrayify-structure-bad-test.js: Added.
+ (foo):
+ (test):
+
</ins><span class="cx"> 2014-05-27 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Update ENABLE(MEDIA_SOURCE) on Mac
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGClobberizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGClobberize.h (169427 => 169428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2014-05-28 18:31:28 UTC (rev 169427)
+++ trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2014-05-28 18:59:38 UTC (rev 169428)
</span><span class="lines">@@ -465,6 +465,7 @@
</span><span class="cx"> write(JSCell_structureID);
</span><span class="cx"> write(JSCell_indexingType);
</span><span class="cx"> write(JSObject_butterfly);
</span><ins>+ write(Watchpoint_fire);
</ins><span class="cx"> clobberizeForAllocation(read, write);
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (169427 => 169428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-05-28 18:31:28 UTC (rev 169427)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-05-28 18:59:38 UTC (rev 169428)
</span><span class="lines">@@ -1405,7 +1405,7 @@
</span><span class="cx"> loadi 8[PC], t0
</span><span class="cx"> loadp 16[PC], t1
</span><span class="cx"> loadConstantOrVariablePayload(t0, CellTag, t3, .opGetArrayLengthSlow)
</span><del>- loadp JSCell::m_structureID[t3], t2
</del><ins>+ loadp t3, t2
</ins><span class="cx"> arrayProfile(t2, t1, t0)
</span><span class="cx"> btiz t2, IsArray, .opGetArrayLengthSlow
</span><span class="cx"> btiz t2, IndexingShapeMask, .opGetArrayLengthSlow
</span><span class="lines">@@ -1539,7 +1539,7 @@
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadi 8[PC], t2
</span><span class="cx"> loadConstantOrVariablePayload(t2, CellTag, t0, .opGetByValSlow)
</span><del>- loadp JSCell::m_structureID[t0], t2
</del><ins>+ move t0, t2
</ins><span class="cx"> loadp 16[PC], t3
</span><span class="cx"> arrayProfile(t2, t3, t1)
</span><span class="cx"> loadi 12[PC], t3
</span><span class="lines">@@ -1665,7 +1665,7 @@
</span><span class="cx"> writeBarrierOnOperands(1, 3)
</span><span class="cx"> loadi 4[PC], t0
</span><span class="cx"> loadConstantOrVariablePayload(t0, CellTag, t1, .opPutByValSlow)
</span><del>- loadp JSCell::m_structureID[t1], t2
</del><ins>+ move t1, t2
</ins><span class="cx"> loadp 16[PC], t3
</span><span class="cx"> arrayProfile(t2, t3, t0)
</span><span class="cx"> loadi 8[PC], t0
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrayifyfireswatchpointjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/arrayify-fires-watchpoint.js (0 => 169428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrayify-fires-watchpoint.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/arrayify-fires-watchpoint.js 2014-05-28 18:59:38 UTC (rev 169428)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+function foo(a, b) {
+ var x = b.f;
+ x += a[0];
+ return x + b.f;
+}
+
+noInline(foo);
+
+function test(a, b, c) {
+ var result = foo(a, b);
+ if (result != c)
+ throw new Error("bad result: expected " + c + " but got: " + result);
+}
+
+function makeObjectArray(value) {
+ var result = {};
+ result[0] = value;
+ return result;
+}
+
+var p = {f:42};
+p[0] = 5;
+for (var i = 0; i < 100000; ++i) {
+ test(makeObjectArray(4), p, 88);
+ test(makeObjectArray(4.5), p, 88.5);
+}
+
+test(p, p, 89);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrayifystructurebadtestjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/arrayify-structure-bad-test.js (0 => 169428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrayify-structure-bad-test.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/arrayify-structure-bad-test.js 2014-05-28 18:59:38 UTC (rev 169428)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+function foo(a, b) {
+ var x = b.f;
+ x += a[0];
+ return x + b.f;
+}
+
+noInline(foo);
+
+function test(a, b, c) {
+ var result = foo(a, b);
+ if (result != c)
+ throw new Error("bad result: expected " + c + " but got: " + result);
+}
+
+var p = {f:42};
+p[0] = 5;
+for (var i = 0; i < 100000; ++i) {
+ test([4], p, 88);
+ test([4.5], p, 88.5);
+}
+
+test(p, p, 89);
</ins></span></pre>
</div>
</div>
</body>
</html>