<!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>[185032] 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/185032">185032</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-30 14:48:35 -0700 (Sat, 30 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL codegen for MultiGetByOffset and MultiPutByOffset where the structure set is already proved should have an unreachable default case instead of an exit
https://bugs.webkit.org/show_bug.cgi?id=145469
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Omitting the speculation on the fail path when the speculation is guaranteed not to be
taken hints to LLVM that the default case is impossible. This enables some useful
optimizations.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileMultiGetByOffset):
(JSC::FTL::LowerDFGToLLVM::compileMultiPutByOffset):
LayoutTests:
* js/regress/repeat-multi-get-by-offset-expected.txt: Added.
* js/regress/repeat-multi-get-by-offset.html: Added.
* js/regress/script-tests/repeat-multi-get-by-offset.js: Added.
(foo):</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="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregressrepeatmultigetbyoffsetexpectedtxt">trunk/LayoutTests/js/regress/repeat-multi-get-by-offset-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressrepeatmultigetbyoffsethtml">trunk/LayoutTests/js/regress/repeat-multi-get-by-offset.html</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsrepeatmultigetbyoffsetjs">trunk/LayoutTests/js/regress/script-tests/repeat-multi-get-by-offset.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185031 => 185032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-30 08:52:28 UTC (rev 185031)
+++ trunk/LayoutTests/ChangeLog 2015-05-30 21:48:35 UTC (rev 185032)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-05-30 Filip Pizlo <fpizlo@apple.com>
+
+ FTL codegen for MultiGetByOffset and MultiPutByOffset where the structure set is already proved should have an unreachable default case instead of an exit
+ https://bugs.webkit.org/show_bug.cgi?id=145469
+
+ Reviewed by Geoffrey Garen.
+
+ * js/regress/repeat-multi-get-by-offset-expected.txt: Added.
+ * js/regress/repeat-multi-get-by-offset.html: Added.
+ * js/regress/script-tests/repeat-multi-get-by-offset.js: Added.
+ (foo):
+
</ins><span class="cx"> 2015-05-29 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> WeakMap reference w/ DOM element as key does not survive long enough.
</span></span></pre></div>
<a id="trunkLayoutTestsjsregressrepeatmultigetbyoffsetexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/repeat-multi-get-by-offset-expected.txt (0 => 185032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/repeat-multi-get-by-offset-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/repeat-multi-get-by-offset-expected.txt 2015-05-30 21:48:35 UTC (rev 185032)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/repeat-multi-get-by-offset
+
+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="trunkLayoutTestsjsregressrepeatmultigetbyoffsethtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/repeat-multi-get-by-offset.html (0 => 185032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/repeat-multi-get-by-offset.html (rev 0)
+++ trunk/LayoutTests/js/regress/repeat-multi-get-by-offset.html 2015-05-30 21:48:35 UTC (rev 185032)
</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/repeat-multi-get-by-offset.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="trunkLayoutTestsjsregressscripttestsrepeatmultigetbyoffsetjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/repeat-multi-get-by-offset.js (0 => 185032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/repeat-multi-get-by-offset.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/repeat-multi-get-by-offset.js 2015-05-30 21:48:35 UTC (rev 185032)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+function foo(o) {
+ return o.f + o.g;
+}
+
+noInline(foo);
+
+var o = { f:1, g:2 };
+var p = { g:3, f:4 };
+for (var i = 0; i < 2000000; ++i) {
+ foo(o);
+ foo(p);
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (185031 => 185032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-30 08:52:28 UTC (rev 185031)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-30 21:48:35 UTC (rev 185032)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-05-29 Filip Pizlo <fpizlo@apple.com>
+
+ FTL codegen for MultiGetByOffset and MultiPutByOffset where the structure set is already proved should have an unreachable default case instead of an exit
+ https://bugs.webkit.org/show_bug.cgi?id=145469
+
+ Reviewed by Geoffrey Garen.
+
+ Omitting the speculation on the fail path when the speculation is guaranteed not to be
+ taken hints to LLVM that the default case is impossible. This enables some useful
+ optimizations.
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileMultiGetByOffset):
+ (JSC::FTL::LowerDFGToLLVM::compileMultiPutByOffset):
+
</ins><span class="cx"> 2015-05-29 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Refactoring HandlerInfo and UnlinkedHandlerInfo.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (185031 => 185032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-05-30 08:52:28 UTC (rev 185031)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-05-30 21:48:35 UTC (rev 185032)
</span><span class="lines">@@ -3778,11 +3778,13 @@
</span><span class="cx"> LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("MultiGetByOffset continuation"));
</span><span class="cx">
</span><span class="cx"> Vector<SwitchCase, 2> cases;
</span><ins>+ StructureSet baseSet;
</ins><span class="cx"> for (unsigned i = data.variants.size(); i--;) {
</span><span class="cx"> GetByIdVariant variant = data.variants[i];
</span><span class="cx"> for (unsigned j = variant.structureSet().size(); j--;) {
</span><del>- cases.append(SwitchCase(
- weakStructureID(variant.structureSet()[j]), blocks[i], Weight(1)));
</del><ins>+ Structure* structure = variant.structureSet()[j];
+ baseSet.add(structure);
+ cases.append(SwitchCase(weakStructureID(structure), blocks[i], Weight(1)));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> m_out.switchInstruction(
</span><span class="lines">@@ -3795,6 +3797,7 @@
</span><span class="cx"> m_out.appendTo(blocks[i], i + 1 < data.variants.size() ? blocks[i + 1] : exit);
</span><span class="cx">
</span><span class="cx"> GetByIdVariant variant = data.variants[i];
</span><ins>+ baseSet.merge(variant.structureSet());
</ins><span class="cx"> LValue result;
</span><span class="cx"> JSValue constantResult;
</span><span class="cx"> if (variant.alternateBase()) {
</span><span class="lines">@@ -3819,7 +3822,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_out.appendTo(exit, continuation);
</span><del>- speculate(BadCache, noValue(), nullptr, m_out.booleanTrue);
</del><ins>+ if (!m_interpreter.forNode(m_node->child1()).m_structure.isSubsetOf(baseSet))
+ speculate(BadCache, noValue(), nullptr, m_out.booleanTrue);
</ins><span class="cx"> m_out.unreachable();
</span><span class="cx">
</span><span class="cx"> m_out.appendTo(continuation, lastNext);
</span><span class="lines">@@ -3849,11 +3853,13 @@
</span><span class="cx"> LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("MultiPutByOffset continuation"));
</span><span class="cx">
</span><span class="cx"> Vector<SwitchCase, 2> cases;
</span><ins>+ StructureSet baseSet;
</ins><span class="cx"> for (unsigned i = data.variants.size(); i--;) {
</span><span class="cx"> PutByIdVariant variant = data.variants[i];
</span><span class="cx"> for (unsigned j = variant.oldStructure().size(); j--;) {
</span><del>- cases.append(
- SwitchCase(weakStructureID(variant.oldStructure()[j]), blocks[i], Weight(1)));
</del><ins>+ Structure* structure = variant.oldStructure()[j];
+ baseSet.add(structure);
+ cases.append(SwitchCase(weakStructureID(structure), blocks[i], Weight(1)));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> m_out.switchInstruction(
</span><span class="lines">@@ -3893,7 +3899,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_out.appendTo(exit, continuation);
</span><del>- speculate(BadCache, noValue(), nullptr, m_out.booleanTrue);
</del><ins>+ if (!m_interpreter.forNode(m_node->child1()).m_structure.isSubsetOf(baseSet))
+ speculate(BadCache, noValue(), nullptr, m_out.booleanTrue);
</ins><span class="cx"> m_out.unreachable();
</span><span class="cx">
</span><span class="cx"> m_out.appendTo(continuation, lastNext);
</span></span></pre>
</div>
</div>
</body>
</html>