<!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>[184528] branches/safari-601.1.32-branch</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/184528">184528</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-18 17:09:16 -0700 (Mon, 18 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/184510">r184510</a>. rdar://problem/21004989</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchLayoutTestsChangeLog">branches/safari-601.1.32-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreChangeLog">branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoredfgDFGFixupPhasecpp">branches/safari-601.1.32-branch/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601132branchLayoutTestsjsregressscripttestsslowternariesjs">branches/safari-601.1.32-branch/LayoutTests/js/regress/script-tests/slow-ternaries.js</a></li>
<li><a href="#branchessafari601132branchLayoutTestsjsregressslowternariesexpectedtxt">branches/safari-601.1.32-branch/LayoutTests/js/regress/slow-ternaries-expected.txt</a></li>
<li><a href="#branchessafari601132branchLayoutTestsjsregressslowternarieshtml">branches/safari-601.1.32-branch/LayoutTests/js/regress/slow-ternaries.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/LayoutTests/ChangeLog (184527 => 184528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/LayoutTests/ChangeLog 2015-05-19 00:09:01 UTC (rev 184527)
+++ branches/safari-601.1.32-branch/LayoutTests/ChangeLog 2015-05-19 00:09:16 UTC (rev 184528)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184510. rdar://problem/21004989
+
+ 2015-05-18 Filip Pizlo <fpizlo@apple.com>
+
+ Add a Int-or-Boolean speculation to Branch
+ https://bugs.webkit.org/show_bug.cgi?id=145134
+
+ Reviewed by Benjamin Poulain.
+
+ Added the reduced asm.js test case from https://bugs.webkit.org/show_bug.cgi?id=144136. We don't yet
+ run it as fast as we should but this is a big step.
+
+ * js/regress/script-tests/slow-ternaries.js: Added.
+ (.f):
+ (asmMod):
+ * js/regress/slow-ternaries-expected.txt: Added.
+ * js/regress/slow-ternaries.html: Added.
+
+2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r183912. rdar://problem/20926150
</span><span class="cx">
</span><span class="cx"> 2015-05-06 Ryosuke Niwa <rniwa@webkit.org>
</span></span></pre></div>
<a id="branchessafari601132branchLayoutTestsjsregressscripttestsslowternariesjs"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.32-branch/LayoutTests/js/regress/script-tests/slow-ternaries.js (0 => 184528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/LayoutTests/js/regress/script-tests/slow-ternaries.js (rev 0)
+++ branches/safari-601.1.32-branch/LayoutTests/js/regress/script-tests/slow-ternaries.js 2015-05-19 00:09:16 UTC (rev 184528)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+var asmMod = function test (glob, env, b) {
+ 'use asm';
+ const i8 = new glob.Int8Array(b);
+ function f() {
+ var i = 0; var r = 0;
+ for (i = 0; (i | 0) < 3000000; i = (i + 1) | 0) {
+ if ((i8[(i & 0xff) >> 0] | 0) == 1 ? ((i8[((i & 0xff) + 1) >> 0] | 0) == 2 ? ((i8[((i & 0xff) + 2) >> 0] | 0) == 3 ? (i8[((i & 0xff) + 3) >> 0] | 0) == 4 : 0) : 0) : 0)
+ r = 1;
+ }
+ return r | 0;
+ }
+ return f;
+};
+var buffer1 = new ArrayBuffer(64*1024);
+var asm1 = asmMod(this, {}, buffer1);
+for (var i = 0; i < 5; i++) asm1();
</ins></span></pre></div>
<a id="branchessafari601132branchLayoutTestsjsregressslowternariesexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.32-branch/LayoutTests/js/regress/slow-ternaries-expected.txt (0 => 184528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/LayoutTests/js/regress/slow-ternaries-expected.txt (rev 0)
+++ branches/safari-601.1.32-branch/LayoutTests/js/regress/slow-ternaries-expected.txt 2015-05-19 00:09:16 UTC (rev 184528)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/slow-ternaries
+
+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="branchessafari601132branchLayoutTestsjsregressslowternarieshtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.32-branch/LayoutTests/js/regress/slow-ternaries.html (0 => 184528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/LayoutTests/js/regress/slow-ternaries.html (rev 0)
+++ branches/safari-601.1.32-branch/LayoutTests/js/regress/slow-ternaries.html 2015-05-19 00:09:16 UTC (rev 184528)
</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/slow-ternaries.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="branchessafari601132branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog (184527 => 184528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog 2015-05-19 00:09:01 UTC (rev 184527)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog 2015-05-19 00:09:16 UTC (rev 184528)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184510. rdar://problem/21004989
+
+ 2015-05-18 Filip Pizlo <fpizlo@apple.com>
+
+ Add a Int-or-Boolean speculation to Branch
+ https://bugs.webkit.org/show_bug.cgi?id=145134
+
+ Reviewed by Benjamin Poulain.
+
+ After https://bugs.webkit.org/show_bug.cgi?id=126778 we no longer have a reason not to do the
+ int-or-boolean optimization that we already do everywhere else.
+
+ * dfg/DFGFixupPhase.cpp:
+ (JSC::DFG::FixupPhase::fixupNode):
+
+2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r184445. rdar://problem/20979071
</span><span class="cx">
</span><span class="cx"> 2015-05-17 Filip Pizlo <fpizlo@apple.com>
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (184527 => 184528)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-05-19 00:09:01 UTC (rev 184527)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-05-19 00:09:16 UTC (rev 184528)
</span><span class="lines">@@ -720,11 +720,8 @@
</span><span class="cx"> fixEdge<BooleanUse>(node->child1());
</span><span class="cx"> else if (node->child1()->shouldSpeculateObjectOrOther())
</span><span class="cx"> fixEdge<ObjectOrOtherUse>(node->child1());
</span><del>- // FIXME: We should just be able to do shouldSpeculateInt32OrBoolean() and
- // shouldSpeculateNumberOrBoolean() here now that
- // https://bugs.webkit.org/show_bug.cgi?id=126778 is fixed.
- else if (node->child1()->shouldSpeculateInt32())
- fixEdge<Int32Use>(node->child1());
</del><ins>+ else if (node->child1()->shouldSpeculateInt32OrBoolean())
+ fixIntOrBooleanEdge(node->child1());
</ins><span class="cx"> else if (node->child1()->shouldSpeculateNumber())
</span><span class="cx"> fixEdge<DoubleRepUse>(node->child1());
</span><span class="cx"> else if (node->child1()->shouldSpeculateString())
</span></span></pre>
</div>
</div>
</body>
</html>