<!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>[161392] branches/jsCStack</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/161392">161392</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-06 19:17:11 -0800 (Mon, 06 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/JavaScriptCore: Merge trunk <a href="http://trac.webkit.org/projects/webkit/changeset/160238">r160238</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/160242">r160242</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/160246">r160246</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/160252">r160252</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/160257">r160257</a>.
LayoutTests: Merge trunk <a href="http://trac.webkit.org/projects/webkit/changeset/160242">r160242</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/160246">r160246</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/160252">r160252</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/160257">r160257</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackLayoutTestsChangeLog">branches/jsCStack/LayoutTests/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGGraphh">branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLCapabilitiescpp">branches/jsCStack/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLIntrinsicRepositoryh">branches/jsCStack/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchesjsCStackLayoutTestsjsregressbyvalgenericexpectedtxt">branches/jsCStack/LayoutTests/js/regress/by-val-generic-expected.txt</a></li>
<li><a href="#branchesjsCStackLayoutTestsjsregressbyvalgenerichtml">branches/jsCStack/LayoutTests/js/regress/by-val-generic.html</a></li>
<li><a href="#branchesjsCStackLayoutTestsjsregressdoublegetbyvaloutofboundsexpectedtxt">branches/jsCStack/LayoutTests/js/regress/double-get-by-val-out-of-bounds-expected.txt</a></li>
<li><a href="#branchesjsCStackLayoutTestsjsregressdoublegetbyvaloutofboundshtml">branches/jsCStack/LayoutTests/js/regress/double-get-by-val-out-of-bounds.html</a></li>
<li><a href="#branchesjsCStackLayoutTestsjsregressgetbyvaloutofboundsexpectedtxt">branches/jsCStack/LayoutTests/js/regress/get-by-val-out-of-bounds-expected.txt</a></li>
<li><a href="#branchesjsCStackLayoutTestsjsregressgetbyvaloutofboundshtml">branches/jsCStack/LayoutTests/js/regress/get-by-val-out-of-bounds.html</a></li>
<li><a href="#branchesjsCStackLayoutTestsjsregresslogicalnotexpectedtxt">branches/jsCStack/LayoutTests/js/regress/logical-not-expected.txt</a></li>
<li><a href="#branchesjsCStackLayoutTestsjsregresslogicalnothtml">branches/jsCStack/LayoutTests/js/regress/logical-not.html</a></li>
<li><a href="#branchesjsCStackLayoutTestsjsregressputbyvalmachineintexpectedtxt">branches/jsCStack/LayoutTests/js/regress/put-by-val-machine-int-expected.txt</a></li>
<li><a href="#branchesjsCStackLayoutTestsjsregressputbyvalmachineinthtml">branches/jsCStack/LayoutTests/js/regress/put-by-val-machine-int.html</a></li>
<li><a href="#branchesjsCStackLayoutTestsjsregressscripttestsbyvalgenericjs">branches/jsCStack/LayoutTests/js/regress/script-tests/by-val-generic.js</a></li>
<li><a href="#branchesjsCStackLayoutTestsjsregressscripttestsdoublegetbyvaloutofboundsjs">branches/jsCStack/LayoutTests/js/regress/script-tests/double-get-by-val-out-of-bounds.js</a></li>
<li><a href="#branchesjsCStackLayoutTestsjsregressscripttestsgetbyvaloutofboundsjs">branches/jsCStack/LayoutTests/js/regress/script-tests/get-by-val-out-of-bounds.js</a></li>
<li><a href="#branchesjsCStackLayoutTestsjsregressscripttestslogicalnotjs">branches/jsCStack/LayoutTests/js/regress/script-tests/logical-not.js</a></li>
<li><a href="#branchesjsCStackLayoutTestsjsregressscripttestsputbyvalmachineintjs">branches/jsCStack/LayoutTests/js/regress/script-tests/put-by-val-machine-int.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/LayoutTests/ChangeLog (161391 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/ChangeLog 2014-01-07 02:04:20 UTC (rev 161391)
+++ branches/jsCStack/LayoutTests/ChangeLog 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2014-01-06 Filip Pizlo <fpizlo@apple.com>
+
+ Merge trunk r160242, r160246, r160252, r160257.
+
</ins><span class="cx"> 2013-12-06 Michał Pakuła vel Rutka <m.pakula@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL gardening
</span></span></pre></div>
<a id="branchesjsCStackLayoutTestsjsregressbyvalgenericexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/by-val-generic-expected.txt (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/by-val-generic-expected.txt (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/by-val-generic-expected.txt 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/by-val-generic
+
+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="branchesjsCStackLayoutTestsjsregressbyvalgenerichtml"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/by-val-generic.html (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/by-val-generic.html (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/by-val-generic.html 2014-01-07 03:17:11 UTC (rev 161392)
</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/by-val-generic.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="branchesjsCStackLayoutTestsjsregressdoublegetbyvaloutofboundsexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/double-get-by-val-out-of-bounds-expected.txt (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/double-get-by-val-out-of-bounds-expected.txt (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/double-get-by-val-out-of-bounds-expected.txt 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/double-get-by-val-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="branchesjsCStackLayoutTestsjsregressdoublegetbyvaloutofboundshtml"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/double-get-by-val-out-of-bounds.html (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/double-get-by-val-out-of-bounds.html (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/double-get-by-val-out-of-bounds.html 2014-01-07 03:17:11 UTC (rev 161392)
</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/double-get-by-val-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="branchesjsCStackLayoutTestsjsregressgetbyvaloutofboundsexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/get-by-val-out-of-bounds-expected.txt (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/get-by-val-out-of-bounds-expected.txt (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/get-by-val-out-of-bounds-expected.txt 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/get-by-val-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="branchesjsCStackLayoutTestsjsregressgetbyvaloutofboundshtml"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/get-by-val-out-of-bounds.html (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/get-by-val-out-of-bounds.html (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/get-by-val-out-of-bounds.html 2014-01-07 03:17:11 UTC (rev 161392)
</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/get-by-val-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="branchesjsCStackLayoutTestsjsregresslogicalnotexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/logical-not-expected.txt (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/logical-not-expected.txt (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/logical-not-expected.txt 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/logical-not
+
+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="branchesjsCStackLayoutTestsjsregresslogicalnothtml"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/logical-not.html (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/logical-not.html (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/logical-not.html 2014-01-07 03:17:11 UTC (rev 161392)
</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/logical-not.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="branchesjsCStackLayoutTestsjsregressputbyvalmachineintexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/put-by-val-machine-int-expected.txt (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/put-by-val-machine-int-expected.txt (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/put-by-val-machine-int-expected.txt 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/put-by-val-machine-int
+
+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="branchesjsCStackLayoutTestsjsregressputbyvalmachineinthtml"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/put-by-val-machine-int.html (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/put-by-val-machine-int.html (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/put-by-val-machine-int.html 2014-01-07 03:17:11 UTC (rev 161392)
</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/put-by-val-machine-int.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="branchesjsCStackLayoutTestsjsregressscripttestsbyvalgenericjs"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/script-tests/by-val-generic.js (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/script-tests/by-val-generic.js (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/script-tests/by-val-generic.js 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+function foo(a, b, c) {
+ a[b] = c;
+ return a[b];
+}
+
+noInline(foo);
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo({}, "foo", "bar");
+ if (result !== "bar")
+ throw "Error: bad result: " + result;
+}
</ins></span></pre></div>
<a id="branchesjsCStackLayoutTestsjsregressscripttestsdoublegetbyvaloutofboundsjs"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/script-tests/double-get-by-val-out-of-bounds.js (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/script-tests/double-get-by-val-out-of-bounds.js (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/script-tests/double-get-by-val-out-of-bounds.js 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+function foo(a) {
+ return a[1];
+}
+
+noInline(foo);
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo([42.5]);
+ if (result !== void 0)
+ throw "Error: bad value: " + result;
+}
</ins></span></pre></div>
<a id="branchesjsCStackLayoutTestsjsregressscripttestsgetbyvaloutofboundsjs"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/script-tests/get-by-val-out-of-bounds.js (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/script-tests/get-by-val-out-of-bounds.js (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/script-tests/get-by-val-out-of-bounds.js 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+function foo(a) {
+ return a[1];
+}
+
+noInline(foo);
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo([42]);
+ if (result !== void 0)
+ throw "Error: bad value: " + result;
+}
</ins></span></pre></div>
<a id="branchesjsCStackLayoutTestsjsregressscripttestslogicalnotjs"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/script-tests/logical-not.js (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/script-tests/logical-not.js (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/script-tests/logical-not.js 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+function foo(v) {
+ return !v;
+}
+
+noInline(foo);
+
+var array = ["foo", 42, null, {}, true, false];
+var expected = [false, false, true, false, false, true];
+
+for (var i = 0; i < 200000; ++i) {
+ var result = foo(array[i % array.length]);
+ if (result !== expected[i % array.length])
+ throw "Error: bad result at " + i + ": " + result;
+}
</ins></span></pre></div>
<a id="branchesjsCStackLayoutTestsjsregressscripttestsputbyvalmachineintjs"></a>
<div class="addfile"><h4>Added: branches/jsCStack/LayoutTests/js/regress/script-tests/put-by-val-machine-int.js (0 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/LayoutTests/js/regress/script-tests/put-by-val-machine-int.js (rev 0)
+++ branches/jsCStack/LayoutTests/js/regress/script-tests/put-by-val-machine-int.js 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+function foo(a, v) {
+ a[0] = v + 2000000000;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 100000; ++i) {
+ var a = new Int32Array(1);
+ foo(a, 2000000000);
+ if (a[0] != -294967296)
+ throw "Error: bad value: " + a[0];
+}
</ins></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (161391 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-07 02:04:20 UTC (rev 161391)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2014-01-06 Filip Pizlo <fpizlo@apple.com>
+
+ Merge trunk r160238, r160242, r160246, r160252, r160257.
+
</ins><span class="cx"> 2014-01-06 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> CStack Branch: Disable JIT stack alignment check for ARM64
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGGraphh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.h (161391 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.h 2014-01-07 02:04:20 UTC (rev 161391)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.h 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -428,6 +428,18 @@
</span><span class="cx"> return baselineCodeBlockForOriginAndBaselineCodeBlock(codeOrigin, m_profiledBlock);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool isStrictModeFor(CodeOrigin codeOrigin)
+ {
+ if (!codeOrigin.inlineCallFrame)
+ return m_codeBlock->isStrictMode();
+ return jsCast<FunctionExecutable*>(codeOrigin.inlineCallFrame->executable.get())->isStrictMode();
+ }
+
+ ECMAMode ecmaModeFor(CodeOrigin codeOrigin)
+ {
+ return isStrictModeFor(codeOrigin) ? StrictMode : NotStrictMode;
+ }
+
</ins><span class="cx"> bool masqueradesAsUndefinedWatchpointIsStillValid(const CodeOrigin& codeOrigin)
</span><span class="cx"> {
</span><span class="cx"> return m_plan.watchpoints.isStillValid(
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (161391 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-01-07 02:04:20 UTC (rev 161391)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -105,6 +105,9 @@
</span><span class="cx"> case NotifyWrite:
</span><span class="cx"> case Call:
</span><span class="cx"> case Construct:
</span><ins>+ case ValueToInt32:
+ case Branch:
+ case LogicalNot:
</ins><span class="cx"> // These are OK.
</span><span class="cx"> break;
</span><span class="cx"> case GetById:
</span><span class="lines">@@ -146,8 +149,8 @@
</span><span class="cx"> case GetByVal:
</span><span class="cx"> switch (node->arrayMode().type()) {
</span><span class="cx"> case Array::ForceExit:
</span><ins>+ case Array::Generic:
</ins><span class="cx"> case Array::String:
</span><del>- return CanCompileAndOSREnter;
</del><span class="cx"> case Array::Int32:
</span><span class="cx"> case Array::Double:
</span><span class="cx"> case Array::Contiguous:
</span><span class="lines">@@ -157,19 +160,13 @@
</span><span class="cx"> return CanCompileAndOSREnter;
</span><span class="cx"> return CannotCompile;
</span><span class="cx"> }
</span><del>- switch (node->arrayMode().speculation()) {
- case Array::SaneChain:
- case Array::InBounds:
- break;
- default:
- return CannotCompile;
- }
</del><span class="cx"> break;
</span><span class="cx"> case PutByVal:
</span><span class="cx"> case PutByValAlias:
</span><ins>+ case PutByValDirect:
</ins><span class="cx"> switch (node->arrayMode().type()) {
</span><span class="cx"> case Array::ForceExit:
</span><del>- return CanCompileAndOSREnter;
</del><ins>+ case Array::Generic:
</ins><span class="cx"> case Array::Int32:
</span><span class="cx"> case Array::Double:
</span><span class="cx"> case Array::Contiguous:
</span><span class="lines">@@ -202,19 +199,6 @@
</span><span class="cx"> if (node->isBinaryUseKind(NumberUse))
</span><span class="cx"> break;
</span><span class="cx"> return CannotCompile;
</span><del>- case Branch:
- case LogicalNot:
- switch (node->child1().useKind()) {
- case BooleanUse:
- case Int32Use:
- case NumberUse:
- case StringUse:
- case ObjectOrOtherUse:
- break;
- default:
- return CannotCompile;
- }
- break;
</del><span class="cx"> case Switch:
</span><span class="cx"> switch (node->switchData()->kind) {
</span><span class="cx"> case SwitchImm:
</span><span class="lines">@@ -224,10 +208,6 @@
</span><span class="cx"> return CannotCompile;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><del>- case ValueToInt32:
- if (node->child1().useKind() != BooleanUse)
- return CannotCompile;
- break;
</del><span class="cx"> default:
</span><span class="cx"> // Don't know how to handle anything else.
</span><span class="cx"> return CannotCompile;
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLIntrinsicRepositoryh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h (161391 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h 2014-01-07 02:04:20 UTC (rev 161391)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -55,6 +55,8 @@
</span><span class="cx"> macro(C_JITOperation_ESt, functionType(intPtr, intPtr, intPtr)) \
</span><span class="cx"> macro(I_JITOperation_EJss, functionType(intPtr, intPtr, intPtr)) \
</span><span class="cx"> macro(J_JITOperation_E, functionType(int64, intPtr)) \
</span><ins>+ macro(J_JITOperation_EAZ, functionType(int64, intPtr, intPtr, int32)) \
+ macro(J_JITOperation_EJJ, functionType(int64, intPtr, int64, int64)) \
</ins><span class="cx"> macro(J_JITOperation_EJssZ, functionType(int64, intPtr, intPtr, int32)) \
</span><span class="cx"> macro(J_JITOperation_ESsiJI, functionType(int64, intPtr, intPtr, int64, intPtr)) \
</span><span class="cx"> macro(Jss_JITOperation_EZ, functionType(intPtr, intPtr, int32)) \
</span><span class="lines">@@ -65,6 +67,8 @@
</span><span class="cx"> macro(P_JITOperation_EStPS, functionType(intPtr, intPtr, intPtr, intPtr, intPtr)) \
</span><span class="cx"> macro(P_JITOperation_EStSS, functionType(intPtr, intPtr, intPtr, intPtr, intPtr)) \
</span><span class="cx"> macro(P_JITOperation_EStZ, functionType(intPtr, intPtr, intPtr, int32)) \
</span><ins>+ macro(S_JITOperation_EJ, functionType(intPtr, intPtr, int64)) \
+ macro(V_JITOperation_EJJJ, functionType(voidType, intPtr, int64, int64, int64)) \
</ins><span class="cx"> macro(V_JITOperation_EOZD, functionType(voidType, intPtr, intPtr, int32, doubleType)) \
</span><span class="cx"> macro(V_JITOperation_EOZJ, functionType(voidType, intPtr, intPtr, int32, int64)) \
</span><span class="cx"> macro(V_JITOperation_EVws, functionType(voidType, intPtr, intPtr)) \
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (161391 => 161392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-01-07 02:04:20 UTC (rev 161391)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-01-07 03:17:11 UTC (rev 161392)
</span><span class="lines">@@ -387,6 +387,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case PutByVal:
</span><span class="cx"> case PutByValAlias:
</span><ins>+ case PutByValDirect:
</ins><span class="cx"> compilePutByVal();
</span><span class="cx"> break;
</span><span class="cx"> case NewObject:
</span><span class="lines">@@ -509,8 +510,96 @@
</span><span class="cx">
</span><span class="cx"> void compileValueToInt32()
</span><span class="cx"> {
</span><del>- ASSERT(m_node->child1().useKind() == BooleanUse);
- setInt32(m_out.zeroExt(lowBoolean(m_node->child1()), m_out.int32));
</del><ins>+ switch (m_node->child1().useKind()) {
+ case Int32Use:
+ setInt32(lowInt32(m_node->child1()));
+ break;
+
+ case MachineIntUse:
+ setInt32(m_out.castToInt32(lowStrictInt52(m_node->child1())));
+ break;
+
+ case NumberUse:
+ case NotCellUse: {
+ LoweredNodeValue value = m_int32Values.get(m_node->child1().node());
+ if (isValid(value)) {
+ setInt32(value.value());
+ break;
+ }
+
+ value = m_jsValueValues.get(m_node->child1().node());
+ if (isValid(value)) {
+ LBasicBlock intCase = FTL_NEW_BLOCK(m_out, ("ValueToInt32 int case"));
+ LBasicBlock notIntCase = FTL_NEW_BLOCK(m_out, ("ValueToInt32 not int case"));
+ LBasicBlock doubleCase = 0;
+ LBasicBlock notNumberCase = 0;
+ if (m_node->child1().useKind() == NotCellUse) {
+ doubleCase = FTL_NEW_BLOCK(m_out, ("ValueToInt32 double case"));
+ notNumberCase = FTL_NEW_BLOCK(m_out, ("ValueToInt32 not number case"));
+ }
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("ValueToInt32 continuation"));
+
+ Vector<ValueFromBlock> results;
+
+ m_out.branch(isNotInt32(value.value()), notIntCase, intCase);
+
+ LBasicBlock lastNext = m_out.appendTo(intCase, notIntCase);
+ results.append(m_out.anchor(unboxInt32(value.value())));
+ m_out.jump(continuation);
+
+ if (m_node->child1().useKind() == NumberUse) {
+ m_out.appendTo(notIntCase, continuation);
+ FTL_TYPE_CHECK(
+ jsValueValue(value.value()), m_node->child1(), SpecFullNumber,
+ isCellOrMisc(value.value()));
+ results.append(m_out.anchor(doubleToInt32(unboxDouble(value.value()))));
+ m_out.jump(continuation);
+ } else {
+ m_out.appendTo(notIntCase, doubleCase);
+ m_out.branch(isCellOrMisc(value.value()), notNumberCase, doubleCase);
+
+ m_out.appendTo(doubleCase, notNumberCase);
+ results.append(m_out.anchor(doubleToInt32(unboxDouble(value.value()))));
+ m_out.jump(continuation);
+
+ m_out.appendTo(notNumberCase, continuation);
+
+ FTL_TYPE_CHECK(
+ jsValueValue(value.value()), m_node->child1(), ~SpecCell,
+ isCell(value.value()));
+
+ LValue specialResult = m_out.select(
+ m_out.equal(
+ value.value(),
+ m_out.constInt64(JSValue::encode(jsBoolean(true)))),
+ m_out.int32One, m_out.int32Zero);
+ results.append(m_out.anchor(specialResult));
+ m_out.jump(continuation);
+ }
+
+ m_out.appendTo(continuation, lastNext);
+ setInt32(m_out.phi(m_out.int32, results));
+ break;
+ }
+
+ value = m_doubleValues.get(m_node->child1().node());
+ if (isValid(value)) {
+ setInt32(doubleToInt32(value.value()));
+ break;
+ }
+
+ terminate(Uncountable);
+ break;
+ }
+
+ case BooleanUse:
+ setInt32(m_out.zeroExt(lowBoolean(m_node->child1()), m_out.int32));
+ break;
+
+ default:
+ RELEASE_ASSERT_NOT_REACHED();
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileInt52ToValue()
</span><span class="lines">@@ -1422,25 +1511,45 @@
</span><span class="cx"> LValue index = lowInt32(m_node->child2());
</span><span class="cx"> LValue storage = lowStorage(m_node->child3());
</span><span class="cx">
</span><ins>+ IndexedAbstractHeap& heap = m_node->arrayMode().type() == Array::Int32 ?
+ m_heaps.indexedInt32Properties : m_heaps.indexedContiguousProperties;
+
</ins><span class="cx"> if (m_node->arrayMode().isInBounds()) {
</span><span class="cx"> speculate(
</span><span class="cx"> OutOfBounds, noValue(), 0,
</span><span class="cx"> m_out.aboveOrEqual(
</span><span class="cx"> index, m_out.load32(storage, m_heaps.Butterfly_publicLength)));
</span><span class="cx">
</span><del>- LValue result = m_out.load64(m_out.baseIndex(
- m_node->arrayMode().type() == Array::Int32 ?
- m_heaps.indexedInt32Properties : m_heaps.indexedContiguousProperties,
- storage, m_out.zeroExt(index, m_out.intPtr),
- m_state.forNode(m_node->child2()).m_value));
</del><ins>+ LValue result = m_out.load64(baseIndex(heap, storage, index, m_node->child2()));
</ins><span class="cx"> speculate(LoadFromHole, noValue(), 0, m_out.isZero64(result));
</span><span class="cx"> setJSValue(result);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: Implement hole/OOB loads in the FTL.
- // https://bugs.webkit.org/show_bug.cgi?id=118077
- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LValue base = lowCell(m_node->child1());
+
+ LBasicBlock fastCase = FTL_NEW_BLOCK(m_out, ("GetByVal int/contiguous fast case"));
+ LBasicBlock slowCase = FTL_NEW_BLOCK(m_out, ("GetByVal int/contiguous slow case"));
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("GetByVal int/contiguous continuation"));
+
+ m_out.branch(
+ m_out.aboveOrEqual(
+ index, m_out.load32(storage, m_heaps.Butterfly_publicLength)),
+ slowCase, fastCase);
+
+ LBasicBlock lastNext = m_out.appendTo(fastCase, slowCase);
+
+ ValueFromBlock fastResult = m_out.anchor(
+ m_out.load64(baseIndex(heap, storage, index, m_node->child2())));
+ m_out.branch(m_out.isZero64(fastResult.value()), slowCase, continuation);
+
+ m_out.appendTo(slowCase, continuation);
+ ValueFromBlock slowResult = m_out.anchor(
+ vmCall(m_out.operation(operationGetByValArrayInt), m_callFrame, base, index));
+ m_out.jump(continuation);
+
+ m_out.appendTo(continuation, lastNext);
+ setJSValue(m_out.phi(m_out.int64, fastResult, slowResult));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1448,16 +1557,16 @@
</span><span class="cx"> LValue index = lowInt32(m_node->child2());
</span><span class="cx"> LValue storage = lowStorage(m_node->child3());
</span><span class="cx">
</span><ins>+ IndexedAbstractHeap& heap = m_heaps.indexedDoubleProperties;
+
</ins><span class="cx"> if (m_node->arrayMode().isInBounds()) {
</span><span class="cx"> speculate(
</span><span class="cx"> OutOfBounds, noValue(), 0,
</span><span class="cx"> m_out.aboveOrEqual(
</span><span class="cx"> index, m_out.load32(storage, m_heaps.Butterfly_publicLength)));
</span><span class="cx">
</span><del>- LValue result = m_out.loadDouble(m_out.baseIndex(
- m_heaps.indexedDoubleProperties,
- storage, m_out.zeroExt(index, m_out.intPtr),
- m_state.forNode(m_node->child2()).m_value));
</del><ins>+ LValue result = m_out.loadDouble(
+ baseIndex(heap, storage, index, m_node->child2()));
</ins><span class="cx">
</span><span class="cx"> if (!m_node->arrayMode().isSaneChain()) {
</span><span class="cx"> speculate(
</span><span class="lines">@@ -1468,12 +1577,45 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: Implement hole/OOB loads in the FTL.
- // https://bugs.webkit.org/show_bug.cgi?id=118077
- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ LValue base = lowCell(m_node->child1());
+
+ LBasicBlock inBounds = FTL_NEW_BLOCK(m_out, ("GetByVal double in bounds"));
+ LBasicBlock boxPath = FTL_NEW_BLOCK(m_out, ("GetByVal double boxing"));
+ LBasicBlock slowCase = FTL_NEW_BLOCK(m_out, ("GetByVal double slow case"));
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("GetByVal double continuation"));
+
+ m_out.branch(
+ m_out.aboveOrEqual(
+ index, m_out.load32(storage, m_heaps.Butterfly_publicLength)),
+ slowCase, inBounds);
+
+ LBasicBlock lastNext = m_out.appendTo(inBounds, boxPath);
+ LValue doubleValue = m_out.loadDouble(
+ baseIndex(heap, storage, index, m_node->child2()));
+ m_out.branch(
+ m_out.doubleNotEqualOrUnordered(doubleValue, doubleValue), slowCase, boxPath);
+
+ m_out.appendTo(boxPath, slowCase);
+ ValueFromBlock fastResult = m_out.anchor(boxDouble(doubleValue));
+ m_out.jump(continuation);
+
+ m_out.appendTo(slowCase, continuation);
+ ValueFromBlock slowResult = m_out.anchor(
+ vmCall(m_out.operation(operationGetByValArrayInt), m_callFrame, base, index));
+ m_out.jump(continuation);
+
+ m_out.appendTo(continuation, lastNext);
+ setJSValue(m_out.phi(m_out.int64, fastResult, slowResult));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ case Array::Generic: {
+ setJSValue(vmCall(
+ m_out.operation(operationGetByVal), m_callFrame,
+ lowJSValue(m_node->child1()), lowJSValue(m_node->child2())));
+ return;
+ }
+
</ins><span class="cx"> case Array::String: {
</span><span class="cx"> compileStringCharAt();
</span><span class="cx"> return;
</span><span class="lines">@@ -1572,6 +1714,31 @@
</span><span class="cx"> Edge child2 = m_graph.varArgChild(m_node, 1);
</span><span class="cx"> Edge child3 = m_graph.varArgChild(m_node, 2);
</span><span class="cx"> Edge child4 = m_graph.varArgChild(m_node, 3);
</span><ins>+
+ switch (m_node->arrayMode().type()) {
+ case Array::Generic: {
+ V_JITOperation_EJJJ operation;
+ if (m_node->op() == PutByValDirect) {
+ if (m_graph.isStrictModeFor(m_node->codeOrigin))
+ operation = operationPutByValDirectStrict;
+ else
+ operation = operationPutByValDirectNonStrict;
+ } else {
+ if (m_graph.isStrictModeFor(m_node->codeOrigin))
+ operation = operationPutByValStrict;
+ else
+ operation = operationPutByValNonStrict;
+ }
+
+ vmCall(
+ m_out.operation(operation), m_callFrame,
+ lowJSValue(child1), lowJSValue(child2), lowJSValue(child3));
+ return;
+ }
+
+ default:
+ break;
+ }
</ins><span class="cx">
</span><span class="cx"> LValue base = lowCell(child1);
</span><span class="cx"> LValue index = lowInt32(child2);
</span><span class="lines">@@ -1653,7 +1820,7 @@
</span><span class="cx"> TypedArrayType type = m_node->arrayMode().typedArrayType();
</span><span class="cx">
</span><span class="cx"> if (isTypedView(type)) {
</span><del>- if (m_node->op() == PutByVal) {
</del><ins>+ if (m_node->op() != PutByValAlias) {
</ins><span class="cx"> speculate(
</span><span class="cx"> OutOfBounds, noValue(), 0,
</span><span class="cx"> m_out.aboveOrEqual(
</span><span class="lines">@@ -1677,7 +1844,7 @@
</span><span class="cx"> if (child3.useKind() == Int32Use)
</span><span class="cx"> intValue = lowInt32(child3);
</span><span class="cx"> else
</span><del>- intValue = m_out.castToInt32(lowInt52(child3));
</del><ins>+ intValue = m_out.castToInt32(lowStrictInt52(child3));
</ins><span class="cx">
</span><span class="cx"> if (isClamped(type)) {
</span><span class="cx"> ASSERT(elementSize(type) == 1);
</span><span class="lines">@@ -1733,10 +1900,8 @@
</span><span class="cx">
</span><span class="cx"> m_out.appendTo(continuation, lastNext);
</span><span class="cx"> intValue = m_out.phi(m_out.int32, intValues);
</span><del>- } else if (isSigned(type))
</del><ins>+ } else
</ins><span class="cx"> intValue = doubleToInt32(doubleValue);
</span><del>- else
- intValue = doubleToUInt32(doubleValue);
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2659,6 +2824,13 @@
</span><span class="cx"> info.m_isInvalidationPoint = true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ TypedPointer baseIndex(IndexedAbstractHeap& heap, LValue storage, LValue index, Edge edge)
+ {
+ return m_out.baseIndex(
+ heap, storage, m_out.zeroExt(index, m_out.intPtr),
+ m_state.forNode(edge).m_value);
+ }
+
</ins><span class="cx"> LValue allocateCell(LValue allocator, LValue structure, LBasicBlock slowPath)
</span><span class="cx"> {
</span><span class="cx"> LBasicBlock success = FTL_NEW_BLOCK(m_out, ("object allocation success"));
</span><span class="lines">@@ -2832,6 +3004,27 @@
</span><span class="cx"> LValue length = m_out.load32(stringValue, m_heaps.JSString_length);
</span><span class="cx"> return m_out.notEqual(length, m_out.int32Zero);
</span><span class="cx"> }
</span><ins>+ case UntypedUse: {
+ LValue value = lowJSValue(m_node->child1());
+
+ LBasicBlock slowCase = FTL_NEW_BLOCK(m_out, ("Boolify untyped slow case"));
+ LBasicBlock fastCase = FTL_NEW_BLOCK(m_out, ("Boolify untyped fast case"));
+ LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("Boolify untyped continuation"));
+
+ m_out.branch(isNotBoolean(value), slowCase, fastCase);
+
+ LBasicBlock lastNext = m_out.appendTo(fastCase, slowCase);
+ ValueFromBlock fastResult = m_out.anchor(unboxBoolean(value));
+ m_out.jump(continuation);
+
+ m_out.appendTo(slowCase, continuation);
+ ValueFromBlock slowResult = m_out.anchor(m_out.notNull(vmCall(
+ m_out.operation(operationConvertJSValueToBoolean), m_callFrame, value)));
+ m_out.jump(continuation);
+
+ m_out.appendTo(continuation, lastNext);
+ return m_out.phi(m_out.boolean, fastResult, slowResult);
+ }
</ins><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> return 0;
</span><span class="lines">@@ -3048,14 +3241,6 @@
</span><span class="cx"> return doubleToInt32(doubleValue, -limit, limit);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LValue doubleToUInt32(LValue doubleValue)
- {
- if (Output::hasSensibleDoubleToInt())
- return sensibleDoubleToInt32(doubleValue);
-
- return doubleToInt32(doubleValue, 0, pow(2, 32) - 1, false);
- }
-
</del><span class="cx"> LValue sensibleDoubleToInt32(LValue doubleValue)
</span><span class="cx"> {
</span><span class="cx"> LBasicBlock slowPath = FTL_NEW_BLOCK(m_out, ("sensible doubleToInt32 slow path"));
</span><span class="lines">@@ -3286,7 +3471,7 @@
</span><span class="cx">
</span><span class="cx"> LValue lowCell(Edge edge, OperandSpeculationMode mode = AutomaticOperandSpeculation)
</span><span class="cx"> {
</span><del>- ASSERT_UNUSED(mode, mode == ManualOperandSpeculation || isCell(edge.useKind()));
</del><ins>+ ASSERT_UNUSED(mode, mode == ManualOperandSpeculation || DFG::isCell(edge.useKind()));
</ins><span class="cx">
</span><span class="cx"> if (edge->op() == JSConstant) {
</span><span class="cx"> JSValue value = m_graph.valueOfJSConstant(edge.node());
</span><span class="lines">@@ -3595,6 +3780,11 @@
</span><span class="cx"> return m_out.testNonZero64(jsValue, m_tagMask);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ LValue isCell(LValue jsValue)
+ {
+ return m_out.testIsZero64(jsValue, m_tagMask);
+ }
+
</ins><span class="cx"> LValue isNotBoolean(LValue jsValue)
</span><span class="cx"> {
</span><span class="cx"> return m_out.testNonZero64(
</span></span></pre>
</div>
</div>
</body>
</html>