<!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>[167646] trunk/Source/JavaScriptCore</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/167646">167646</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-21 19:58:00 -0700 (Mon, 21 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Switch statements that skip the baseline JIT should work
https://bugs.webkit.org/show_bug.cgi?id=131965
Reviewed by Mark Hahnenberg.
* bytecode/JumpTable.h:
(JSC::SimpleJumpTable::ensureCTITable):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::emitSwitchIntJump):
* jit/JITOpcodes.cpp:
(JSC::JIT::emit_op_switch_imm):
(JSC::JIT::emit_op_switch_char):
* jit/JITOpcodes32_64.cpp:
(JSC::JIT::emit_op_switch_imm):
(JSC::JIT::emit_op_switch_char):
* tests/stress/inline-llint-with-switch.js: Added.
(foo):
(bar):
(test):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeJumpTableh">trunk/Source/JavaScriptCore/bytecode/JumpTable.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodescpp">trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodes32_64cpp">trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressinlinellintwithswitchjs">trunk/Source/JavaScriptCore/tests/stress/inline-llint-with-switch.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (167645 => 167646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-04-22 02:16:53 UTC (rev 167645)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-04-22 02:58:00 UTC (rev 167646)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-04-21 Filip Pizlo <fpizlo@apple.com>
+
+ Switch statements that skip the baseline JIT should work
+ https://bugs.webkit.org/show_bug.cgi?id=131965
+
+ Reviewed by Mark Hahnenberg.
+
+ * bytecode/JumpTable.h:
+ (JSC::SimpleJumpTable::ensureCTITable):
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::emitSwitchIntJump):
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emit_op_switch_imm):
+ (JSC::JIT::emit_op_switch_char):
+ * jit/JITOpcodes32_64.cpp:
+ (JSC::JIT::emit_op_switch_imm):
+ (JSC::JIT::emit_op_switch_char):
+ * tests/stress/inline-llint-with-switch.js: Added.
+ (foo):
+ (bar):
+ (test):
+
</ins><span class="cx"> 2014-04-21 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> Arguments objects shouldn't need a destructor
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeJumpTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/JumpTable.h (167645 => 167646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/JumpTable.h 2014-04-22 02:16:53 UTC (rev 167645)
+++ trunk/Source/JavaScriptCore/bytecode/JumpTable.h 2014-04-22 02:58:00 UTC (rev 167646)
</span><span class="lines">@@ -94,6 +94,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><ins>+ void ensureCTITable()
+ {
+ ASSERT(ctiOffsets.isEmpty() || ctiOffsets.size() == branchOffsets.size());
+ ctiOffsets.grow(branchOffsets.size());
+ }
+
</ins><span class="cx"> inline CodeLocationLabel ctiForValue(int32_t value)
</span><span class="cx"> {
</span><span class="cx"> if (value >= min && static_cast<uint32_t>(value - min) < ctiOffsets.size())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (167645 => 167646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-04-22 02:16:53 UTC (rev 167645)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-04-22 02:58:00 UTC (rev 167646)
</span><span class="lines">@@ -4947,6 +4947,7 @@
</span><span class="cx"> SwitchData* data, GPRReg value, GPRReg scratch)
</span><span class="cx"> {
</span><span class="cx"> SimpleJumpTable& table = m_jit.codeBlock()->switchJumpTable(data->switchTableIndex);
</span><ins>+ table.ensureCTITable();
</ins><span class="cx"> m_jit.sub32(Imm32(table.min), value);
</span><span class="cx"> addBranch(
</span><span class="cx"> m_jit.branch32(JITCompiler::AboveOrEqual, value, Imm32(table.ctiOffsets.size())),
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp (167645 => 167646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2014-04-22 02:16:53 UTC (rev 167645)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2014-04-22 02:58:00 UTC (rev 167646)
</span><span class="lines">@@ -646,7 +646,7 @@
</span><span class="cx"> // create jump table for switch destinations, track this switch statement.
</span><span class="cx"> SimpleJumpTable* jumpTable = &m_codeBlock->switchJumpTable(tableIndex);
</span><span class="cx"> m_switches.append(SwitchRecord(jumpTable, m_bytecodeOffset, defaultOffset, SwitchRecord::Immediate));
</span><del>- jumpTable->ctiOffsets.grow(jumpTable->branchOffsets.size());
</del><ins>+ jumpTable->ensureCTITable();
</ins><span class="cx">
</span><span class="cx"> emitGetVirtualRegister(scrutinee, regT0);
</span><span class="cx"> callOperation(operationSwitchImmWithUnknownKeyType, regT0, tableIndex);
</span><span class="lines">@@ -662,7 +662,7 @@
</span><span class="cx"> // create jump table for switch destinations, track this switch statement.
</span><span class="cx"> SimpleJumpTable* jumpTable = &m_codeBlock->switchJumpTable(tableIndex);
</span><span class="cx"> m_switches.append(SwitchRecord(jumpTable, m_bytecodeOffset, defaultOffset, SwitchRecord::Character));
</span><del>- jumpTable->ctiOffsets.grow(jumpTable->branchOffsets.size());
</del><ins>+ jumpTable->ensureCTITable();
</ins><span class="cx">
</span><span class="cx"> emitGetVirtualRegister(scrutinee, regT0);
</span><span class="cx"> callOperation(operationSwitchCharWithUnknownKeyType, regT0, tableIndex);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (167645 => 167646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2014-04-22 02:16:53 UTC (rev 167645)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2014-04-22 02:58:00 UTC (rev 167646)
</span><span class="lines">@@ -933,7 +933,7 @@
</span><span class="cx"> // create jump table for switch destinations, track this switch statement.
</span><span class="cx"> SimpleJumpTable* jumpTable = &m_codeBlock->switchJumpTable(tableIndex);
</span><span class="cx"> m_switches.append(SwitchRecord(jumpTable, m_bytecodeOffset, defaultOffset, SwitchRecord::Immediate));
</span><del>- jumpTable->ctiOffsets.grow(jumpTable->branchOffsets.size());
</del><ins>+ jumpTable->ensureCTITable();
</ins><span class="cx">
</span><span class="cx"> emitLoad(scrutinee, regT1, regT0);
</span><span class="cx"> callOperation(operationSwitchImmWithUnknownKeyType, regT1, regT0, tableIndex);
</span><span class="lines">@@ -949,7 +949,7 @@
</span><span class="cx"> // create jump table for switch destinations, track this switch statement.
</span><span class="cx"> SimpleJumpTable* jumpTable = &m_codeBlock->switchJumpTable(tableIndex);
</span><span class="cx"> m_switches.append(SwitchRecord(jumpTable, m_bytecodeOffset, defaultOffset, SwitchRecord::Character));
</span><del>- jumpTable->ctiOffsets.grow(jumpTable->branchOffsets.size());
</del><ins>+ jumpTable->ensureCTITable();
</ins><span class="cx">
</span><span class="cx"> emitLoad(scrutinee, regT1, regT0);
</span><span class="cx"> callOperation(operationSwitchCharWithUnknownKeyType, regT1, regT0, tableIndex);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressinlinellintwithswitchjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/inline-llint-with-switch.js (0 => 167646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/inline-llint-with-switch.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/inline-llint-with-switch.js 2014-04-22 02:58:00 UTC (rev 167646)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+function foo(i) {
+ switch (i) {
+ case 0:
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ case 8:
+ case 9:
+ return 42;
+ default:
+ return "error";
+ }
+}
+
+function bar(p) {
+ if (p)
+ return foo(effectful42() - 42);
+ else
+ return 42;
+}
+
+noInline(bar);
+
+function test(p) {
+ var result = bar(p);
+ if (result != 42)
+ throw "Error: bad result: " + result;
+}
+
+// Make sure that the call to foo() looks like it has happened.
+for (var i = 0; i < 2; ++i)
+ test(true);
+
+// Warm up bar and cause inlining, but make sure that foo() doesn't get DFG'd.
+for (var i = 0; i < 10000; ++i)
+ test(false);
+
+// And finally test the switch statement.
+test(true);
</ins></span></pre>
</div>
</div>
</body>
</html>