<!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>[180703] 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/180703">180703</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-02-26 14:44:45 -0800 (Thu, 26 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Various array access corner cases should take OSR exit feedback
https://bugs.webkit.org/show_bug.cgi?id=142056
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Two major changes here:
- Don't keep converting GetById into GetArrayLength if we exited due to any kind of array
type check.
- Use a generic form of GetByVal/PutByVal if we exited due to any kind of exotic checks,
like the Arguments safety checks. We use the "ExoticObjectMode" for out-of-bounds on
arguments for now, since it's a convenient way of forcing out-of-bounds to be handled by
the Generic array mode.
* bytecode/ExitKind.cpp:
(JSC::exitKindToString):
* bytecode/ExitKind.h:
* dfg/DFGArrayMode.cpp:
(JSC::DFG::ArrayMode::refine):
* dfg/DFGFixupPhase.cpp:
(JSC::DFG::FixupPhase::fixupNode):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileGetByValOnArguments):
(JSC::DFG::SpeculativeJIT::compileGetArgumentsLength):
* tests/stress/array-length-array-storage-plain-object.js: Added.
(foo):
* tests/stress/array-length-plain-object.js: Added.
(foo):
LayoutTests:
* js/regress/arguments-out-of-bounds-expected.txt: Added.
* js/regress/arguments-out-of-bounds.html: Added.
* js/regress/exit-length-on-plain-object-expected.txt: Added.
* js/regress/exit-length-on-plain-object.html: Added.
* js/regress/script-tests/arguments-out-of-bounds.js: Added.
(foo):
(bar):
* js/regress/script-tests/exit-length-on-plain-object.js: Added.
(foo):
* js/regress/script-tests/string-out-of-bounds.js: Added.
(bar):
* js/regress/string-out-of-bounds-expected.txt: Added.
* js/regress/string-out-of-bounds.html: Added.</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="#trunkSourceJavaScriptCorebytecodeExitKindcpp">trunk/Source/JavaScriptCore/bytecode/ExitKind.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeExitKindh">trunk/Source/JavaScriptCore/bytecode/ExitKind.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGArrayModecpp">trunk/Source/JavaScriptCore/dfg/DFGArrayMode.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFixupPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregressargumentsoutofboundsexpectedtxt">trunk/LayoutTests/js/regress/arguments-out-of-bounds-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressargumentsoutofboundshtml">trunk/LayoutTests/js/regress/arguments-out-of-bounds.html</a></li>
<li><a href="#trunkLayoutTestsjsregressexitlengthonplainobjectexpectedtxt">trunk/LayoutTests/js/regress/exit-length-on-plain-object-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressexitlengthonplainobjecthtml">trunk/LayoutTests/js/regress/exit-length-on-plain-object.html</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsargumentsoutofboundsjs">trunk/LayoutTests/js/regress/script-tests/arguments-out-of-bounds.js</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsexitlengthonplainobjectjs">trunk/LayoutTests/js/regress/script-tests/exit-length-on-plain-object.js</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsstringoutofboundsjs">trunk/LayoutTests/js/regress/script-tests/string-out-of-bounds.js</a></li>
<li><a href="#trunkLayoutTestsjsregressstringoutofboundsexpectedtxt">trunk/LayoutTests/js/regress/string-out-of-bounds-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressstringoutofboundshtml">trunk/LayoutTests/js/regress/string-out-of-bounds.html</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarraylengtharraystorageplainobjectjs">trunk/Source/JavaScriptCore/tests/stress/array-length-array-storage-plain-object.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarraylengthplainobjectjs">trunk/Source/JavaScriptCore/tests/stress/array-length-plain-object.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180702 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-26 22:25:31 UTC (rev 180702)
+++ trunk/LayoutTests/ChangeLog 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-02-26 Filip Pizlo <fpizlo@apple.com>
+
+ Various array access corner cases should take OSR exit feedback
+ https://bugs.webkit.org/show_bug.cgi?id=142056
+
+ Reviewed by Geoffrey Garen.
+
+ * js/regress/arguments-out-of-bounds-expected.txt: Added.
+ * js/regress/arguments-out-of-bounds.html: Added.
+ * js/regress/exit-length-on-plain-object-expected.txt: Added.
+ * js/regress/exit-length-on-plain-object.html: Added.
+ * js/regress/script-tests/arguments-out-of-bounds.js: Added.
+ (foo):
+ (bar):
+ * js/regress/script-tests/exit-length-on-plain-object.js: Added.
+ (foo):
+ * js/regress/script-tests/string-out-of-bounds.js: Added.
+ (bar):
+ * js/regress/string-out-of-bounds-expected.txt: Added.
+ * js/regress/string-out-of-bounds.html: Added.
+
</ins><span class="cx"> 2015-02-26 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Rolling out r180602, r180608, r180613, r180617, r180671.
</span></span></pre></div>
<a id="trunkLayoutTestsjsregressargumentsoutofboundsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/arguments-out-of-bounds-expected.txt (0 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/arguments-out-of-bounds-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/arguments-out-of-bounds-expected.txt 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/arguments-out-of-bounds
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressargumentsoutofboundshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/arguments-out-of-bounds.html (0 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/arguments-out-of-bounds.html (rev 0)
+++ trunk/LayoutTests/js/regress/arguments-out-of-bounds.html 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="../../resources/regress-pre.js"></script>
+<script src="script-tests/arguments-out-of-bounds.js"></script>
+<script src="../../resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressexitlengthonplainobjectexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/exit-length-on-plain-object-expected.txt (0 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/exit-length-on-plain-object-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/exit-length-on-plain-object-expected.txt 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/exit-length-on-plain-object
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressexitlengthonplainobjecthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/exit-length-on-plain-object.html (0 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/exit-length-on-plain-object.html (rev 0)
+++ trunk/LayoutTests/js/regress/exit-length-on-plain-object.html 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="../../resources/regress-pre.js"></script>
+<script src="script-tests/exit-length-on-plain-object.js"></script>
+<script src="../../resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsargumentsoutofboundsjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/arguments-out-of-bounds.js (0 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/arguments-out-of-bounds.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/arguments-out-of-bounds.js 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+function foo() { return arguments; }
+noInline(foo);
+
+function bar(o) {
+ var tmp = o[0];
+ var result = 0;
+ for (var i = 0; i < 1000; ++i) {
+ if (tmp)
+ result += tmp * i;
+ }
+ return result;
+}
+noInline(bar);
+
+var result = 0;
+var o = foo();
+for (var i = 0; i < 10000; ++i)
+ result += bar(o);
+
+if (result !== 0)
+ throw "Error: bad result: " + result;
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsexitlengthonplainobjectjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/exit-length-on-plain-object.js (0 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/exit-length-on-plain-object.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/exit-length-on-plain-object.js 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+function foo(o) {
+ var result;
+ for (var i = 0; i < 2; ++i) {
+ var subResult = o.length;
+ if (i == 0) {
+ result = subResult;
+ if (subResult !== void 0)
+ break;
+ }
+ o = [1];
+ }
+ if (result === void 0) {
+ for (var i = 0; i < 10000; ++i) { }
+ }
+ return result;
+}
+
+noInline(foo);
+
+for (var j = 0; j < 10; ++j) {
+ for (var i = 0; i < 10000; ++i) {
+ var a = [1];
+ a.length = 99999999;
+ a.f = 42;
+ foo(a);
+ }
+
+ var result = foo({});
+ if (result !== void 0)
+ throw "Error: bad result: " + result;
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsstringoutofboundsjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/string-out-of-bounds.js (0 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/string-out-of-bounds.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/string-out-of-bounds.js 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+function bar(o) {
+ var tmp = o[0];
+ var result = 0;
+ for (var i = 0; i < 1000; ++i) {
+ if (tmp)
+ result += tmp * i;
+ }
+ return result;
+}
+noInline(bar);
+
+var result = 0;
+for (var i = 0; i < 10000; ++i)
+ result += bar("");
+
+if (result !== 0)
+ throw "Error: bad result: " + result;
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressstringoutofboundsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/string-out-of-bounds-expected.txt (0 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/string-out-of-bounds-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/string-out-of-bounds-expected.txt 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/string-out-of-bounds
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressstringoutofboundshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/string-out-of-bounds.html (0 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/string-out-of-bounds.html (rev 0)
+++ trunk/LayoutTests/js/regress/string-out-of-bounds.html 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="../../resources/regress-pre.js"></script>
+<script src="script-tests/string-out-of-bounds.js"></script>
+<script src="../../resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (180702 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-02-26 22:25:31 UTC (rev 180702)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-02-26 Filip Pizlo <fpizlo@apple.com>
+
+ Various array access corner cases should take OSR exit feedback
+ https://bugs.webkit.org/show_bug.cgi?id=142056
+
+ Reviewed by Geoffrey Garen.
+
+ Two major changes here:
+
+ - Don't keep converting GetById into GetArrayLength if we exited due to any kind of array
+ type check.
+
+ - Use a generic form of GetByVal/PutByVal if we exited due to any kind of exotic checks,
+ like the Arguments safety checks. We use the "ExoticObjectMode" for out-of-bounds on
+ arguments for now, since it's a convenient way of forcing out-of-bounds to be handled by
+ the Generic array mode.
+
+ * bytecode/ExitKind.cpp:
+ (JSC::exitKindToString):
+ * bytecode/ExitKind.h:
+ * dfg/DFGArrayMode.cpp:
+ (JSC::DFG::ArrayMode::refine):
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileGetByValOnArguments):
+ (JSC::DFG::SpeculativeJIT::compileGetArgumentsLength):
+ * tests/stress/array-length-array-storage-plain-object.js: Added.
+ (foo):
+ * tests/stress/array-length-plain-object.js: Added.
+ (foo):
+
</ins><span class="cx"> 2015-02-25 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> DFG SSA stack accesses shouldn't speak of VariableAccessDatas
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeExitKindcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/ExitKind.cpp (180702 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/ExitKind.cpp 2015-02-26 22:25:31 UTC (rev 180702)
+++ trunk/Source/JavaScriptCore/bytecode/ExitKind.cpp 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -64,6 +64,8 @@
</span><span class="cx"> return "InadequateCoverage";
</span><span class="cx"> case ArgumentsEscaped:
</span><span class="cx"> return "ArgumentsEscaped";
</span><ins>+ case ExoticObjectMode:
+ return "ExoticObjectMode";
</ins><span class="cx"> case NotStringObject:
</span><span class="cx"> return "NotStringObject";
</span><span class="cx"> case VarargsOverflow:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeExitKindh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/ExitKind.h (180702 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/ExitKind.h 2015-02-26 22:25:31 UTC (rev 180702)
+++ trunk/Source/JavaScriptCore/bytecode/ExitKind.h 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> OutOfBounds, // We had an out-of-bounds access to an array.
</span><span class="cx"> InadequateCoverage, // We exited because we ended up in code that didn't have profiling coverage.
</span><span class="cx"> ArgumentsEscaped, // We exited because arguments escaped but we didn't expect them to.
</span><ins>+ ExoticObjectMode, // We exited because some exotic object that we were accessing was in an exotic mode (like Arguments with slow arguments).
</ins><span class="cx"> NotStringObject, // We exited because we shouldn't have attempted to optimize string object access.
</span><span class="cx"> VarargsOverflow, // We exited because a varargs call passed more arguments than we expected.
</span><span class="cx"> Uncountable, // We exited for none of the above reasons, and we should not count it. Most uses of this should be viewed as a FIXME.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGArrayModecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGArrayMode.cpp (180702 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGArrayMode.cpp 2015-02-26 22:25:31 UTC (rev 180702)
+++ trunk/Source/JavaScriptCore/dfg/DFGArrayMode.cpp 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -147,6 +147,10 @@
</span><span class="cx"> if (!isInt32Speculation(index))
</span><span class="cx"> return ArrayMode(Array::Generic);
</span><span class="cx">
</span><ins>+ // If we had exited because of an exotic object behavior, then don't try to specialize.
+ if (graph.hasExitSite(node->origin.semantic, ExoticObjectMode))
+ return ArrayMode(Array::Generic);
+
</ins><span class="cx"> // Note: our profiling currently doesn't give us good information in case we have
</span><span class="cx"> // an unlikely control flow path that sets the base to a non-cell value. Value
</span><span class="cx"> // profiling and prediction propagation will probably tell us that the value is
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (180702 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-02-26 22:25:31 UTC (rev 180702)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -919,19 +919,26 @@
</span><span class="cx"> case GetByIdFlush: {
</span><span class="cx"> if (!node->child1()->shouldSpeculateCell())
</span><span class="cx"> break;
</span><del>- StringImpl* impl = m_graph.identifiers()[node->identifierNumber()];
- if (impl == vm().propertyNames->length.impl()) {
- attemptToMakeGetArrayLength(node);
- break;
</del><ins>+
+ // If we hadn't exited because of BadCache, BadIndexingType, or ExoticObjectMode, then
+ // leave this as a GetById.
+ if (!m_graph.hasExitSite(node->origin.semantic, BadCache)
+ && !m_graph.hasExitSite(node->origin.semantic, BadIndexingType)
+ && !m_graph.hasExitSite(node->origin.semantic, ExoticObjectMode)) {
+ StringImpl* impl = m_graph.identifiers()[node->identifierNumber()];
+ if (impl == vm().propertyNames->length.impl()) {
+ attemptToMakeGetArrayLength(node);
+ break;
+ }
+ if (impl == vm().propertyNames->byteLength.impl()) {
+ attemptToMakeGetTypedArrayByteLength(node);
+ break;
+ }
+ if (impl == vm().propertyNames->byteOffset.impl()) {
+ attemptToMakeGetTypedArrayByteOffset(node);
+ break;
+ }
</ins><span class="cx"> }
</span><del>- if (impl == vm().propertyNames->byteLength.impl()) {
- attemptToMakeGetTypedArrayByteLength(node);
- break;
- }
- if (impl == vm().propertyNames->byteOffset.impl()) {
- attemptToMakeGetTypedArrayByteOffset(node);
- break;
- }
</del><span class="cx"> fixEdge<CellUse>(node->child1());
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (180702 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-02-26 22:25:31 UTC (rev 180702)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -4113,12 +4113,12 @@
</span><span class="cx">
</span><span class="cx"> // Two really lame checks.
</span><span class="cx"> speculationCheck(
</span><del>- Uncountable, JSValueSource(), 0,
</del><ins>+ ExoticObjectMode, JSValueSource(), 0,
</ins><span class="cx"> m_jit.branch32(
</span><span class="cx"> MacroAssembler::AboveOrEqual, propertyReg,
</span><span class="cx"> MacroAssembler::Address(baseReg, Arguments::offsetOfNumArguments())));
</span><span class="cx"> speculationCheck(
</span><del>- Uncountable, JSValueSource(), 0,
</del><ins>+ ExoticObjectMode, JSValueSource(), 0,
</ins><span class="cx"> m_jit.branchTestPtr(
</span><span class="cx"> MacroAssembler::NonZero,
</span><span class="cx"> MacroAssembler::Address(
</span><span class="lines">@@ -4168,7 +4168,7 @@
</span><span class="cx"> ASSERT(ArrayMode(Array::Arguments).alreadyChecked(m_jit.graph(), node, m_state.forNode(node->child1())));
</span><span class="cx">
</span><span class="cx"> speculationCheck(
</span><del>- Uncountable, JSValueSource(), 0,
</del><ins>+ ExoticObjectMode, JSValueSource(), 0,
</ins><span class="cx"> m_jit.branchTest8(
</span><span class="cx"> MacroAssembler::NonZero,
</span><span class="cx"> MacroAssembler::Address(baseReg, Arguments::offsetOfOverrodeLength())));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarraylengtharraystorageplainobjectjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/array-length-array-storage-plain-object.js (0 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/array-length-array-storage-plain-object.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/array-length-array-storage-plain-object.js 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+function foo(o) {
+ return o.length;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var a = [1];
+ a.length = 99999999;
+ a.f = 42;
+ foo(a);
+}
+
+var result = foo({});
+if (result !== void 0)
+ throw "Error: bad result: " + result;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarraylengthplainobjectjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/array-length-plain-object.js (0 => 180703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/array-length-plain-object.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/array-length-plain-object.js 2015-02-26 22:44:45 UTC (rev 180703)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+function foo(o) {
+ return o.length;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var a = [1];
+ a.f = 42;
+ foo(a);
+}
+
+var result = foo({});
+if (result !== void 0)
+ throw "Error: bad result: " + result;
</ins></span></pre>
</div>
</div>
</body>
</html>