<!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>[176972] trunk</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/176972">176972</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-12-08 14:12:25 -0800 (Mon, 08 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CFA wrongly assumes that a speculation for SlowPutArrayStorageShape disallows ArrayStorageShape arrays.
<https://webkit.org/b/139327>
Reviewed by Michael Saboff.
Source/JavaScriptCore:
The code generator and runtime slow paths expects otherwise. This patch fixes
CFA to match the code generator's expectation.
* dfg/DFGArrayMode.h:
(JSC::DFG::ArrayMode::arrayModesThatPassFiltering):
(JSC::DFG::ArrayMode::arrayModesWithIndexingShapes):
LayoutTests:
* js/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage-expected.txt: Added.
* js/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage.html: Added.
* js/script-tests/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage.js: Added.
(foo):
(test):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGArrayModeh">trunk/Source/JavaScriptCore/dfg/DFGArrayMode.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsdfgslowputarraystoragespecshouldallowfastarraystorageexpectedtxt">trunk/LayoutTests/js/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsdfgslowputarraystoragespecshouldallowfastarraystoragehtml">trunk/LayoutTests/js/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsdfgslowputarraystoragespecshouldallowfastarraystoragejs">trunk/LayoutTests/js/script-tests/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (176971 => 176972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-12-08 22:10:40 UTC (rev 176971)
+++ trunk/LayoutTests/ChangeLog 2014-12-08 22:12:25 UTC (rev 176972)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-12-08 Mark Lam <mark.lam@apple.com>
+
+ CFA wrongly assumes that a speculation for SlowPutArrayStorageShape disallows ArrayStorageShape arrays.
+ <https://webkit.org/b/139327>
+
+ Reviewed by Michael Saboff.
+
+ * js/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage-expected.txt: Added.
+ * js/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage.html: Added.
+ * js/script-tests/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage.js: Added.
+ (foo):
+ (test):
+
</ins><span class="cx"> 2014-12-08 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Narrow non-breaking space does not fall back to a correct font
</span></span></pre></div>
<a id="trunkLayoutTestsjsdfgslowputarraystoragespecshouldallowfastarraystorageexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage-expected.txt (0 => 176972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage-expected.txt (rev 0)
+++ trunk/LayoutTests/js/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage-expected.txt 2014-12-08 22:12:25 UTC (rev 176972)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+This tests that DFG generated code speculating SlowPutArrayStorageShape doesn't crash when seeing fast ArrayStorageShapes.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsdfgslowputarraystoragespecshouldallowfastarraystoragehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage.html (0 => 176972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage.html (rev 0)
+++ trunk/LayoutTests/js/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage.html 2014-12-08 22:12:25 UTC (rev 176972)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsdfgslowputarraystoragespecshouldallowfastarraystoragejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage.js (0 => 176972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/dfg-slow-put-array-storage-spec-should-allow-fast-array-storage.js 2014-12-08 22:12:25 UTC (rev 176972)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+description(
+"This tests that DFG generated code speculating SlowPutArrayStorageShape doesn't crash when seeing fast ArrayStorageShapes."
+);
+
+var slowPutArrayStorageArray = [ "slow" ];
+var fastArrayStorageArray = [ "fast" ];
+fastArrayStorageArray[1000] = 50;
+
+var o = { a: 10 };
+Object.defineProperties(o, {
+ "0": {
+ set: function(x) { this.a = x; },
+ },
+});
+
+slowPutArrayStorageArray.__proto__ = o;
+
+function foo(a, isFast) {
+ var result = 10;
+ if (!a)
+ return result;
+
+ var doStuff = a[0] && isFast;
+ if (doStuff)
+ result = a[0] + 10;
+ return result;
+}
+
+function test() {
+ for (var k = 0; k < 5000; k++) {
+ foo(slowPutArrayStorageArray, false);
+ foo(fastArrayStorageArray, true);
+ }
+}
+
+test();
+
+var successfullyParsed = true;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (176971 => 176972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-12-08 22:10:40 UTC (rev 176971)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-12-08 22:12:25 UTC (rev 176972)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-12-08 Mark Lam <mark.lam@apple.com>
+
+ CFA wrongly assumes that a speculation for SlowPutArrayStorageShape disallows ArrayStorageShape arrays.
+ <https://webkit.org/b/139327>
+
+ Reviewed by Michael Saboff.
+
+ The code generator and runtime slow paths expects otherwise. This patch fixes
+ CFA to match the code generator's expectation.
+
+ * dfg/DFGArrayMode.h:
+ (JSC::DFG::ArrayMode::arrayModesThatPassFiltering):
+ (JSC::DFG::ArrayMode::arrayModesWithIndexingShapes):
+
</ins><span class="cx"> 2014-12-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert r176293 & r176275
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGArrayModeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGArrayMode.h (176971 => 176972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGArrayMode.h 2014-12-08 22:10:40 UTC (rev 176971)
+++ trunk/Source/JavaScriptCore/dfg/DFGArrayMode.h 2014-12-08 22:12:25 UTC (rev 176972)
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx"> case Array::ArrayStorage:
</span><span class="cx"> return arrayModesWithIndexingShape(ArrayStorageShape);
</span><span class="cx"> case Array::SlowPutArrayStorage:
</span><del>- return arrayModesWithIndexingShape(SlowPutArrayStorageShape);
</del><ins>+ return arrayModesWithIndexingShapes(SlowPutArrayStorageShape, ArrayStorageShape);
</ins><span class="cx"> default:
</span><span class="cx"> return asArrayModes(NonArray);
</span><span class="cx"> }
</span><span class="lines">@@ -462,6 +462,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ArrayModes arrayModesWithIndexingShapes(IndexingType shape1, IndexingType shape2) const
+ {
+ ArrayModes arrayMode1 = arrayModesWithIndexingShape(shape1);
+ ArrayModes arrayMode2 = arrayModesWithIndexingShape(shape2);
+ return arrayMode1 | arrayMode2;
+ }
+
</ins><span class="cx"> bool alreadyChecked(Graph&, Node*, AbstractValue&, IndexingType shape) const;
</span><span class="cx">
</span><span class="cx"> union {
</span></span></pre>
</div>
</div>
</body>
</html>