<!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>[194185] 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/194185">194185</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-12-16 15:59:13 -0800 (Wed, 16 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL B3 should support switches
https://bugs.webkit.org/show_bug.cgi?id=152360
Reviewed by Geoffrey Garen.
I implemented this because I was hoping it would less us run V8/crypto, but instead it just led
me to file a fun bug: https://bugs.webkit.org/show_bug.cgi?id=152365.
* ftl/FTLB3Output.h:
(JSC::FTL::Output::check):
(JSC::FTL::Output::switchInstruction):
(JSC::FTL::Output::ret):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::ftlUnreachable):
(JSC::FTL::DFG::LowerDFGToLLVM::crash):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLB3Outputh">trunk/Source/JavaScriptCore/ftl/FTLB3Output.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194184 => 194185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-16 23:41:05 UTC (rev 194184)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-16 23:59:13 UTC (rev 194185)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-16 Filip Pizlo <fpizlo@apple.com>
+
+ FTL B3 should support switches
+ https://bugs.webkit.org/show_bug.cgi?id=152360
+
+ Reviewed by Geoffrey Garen.
+
+ I implemented this because I was hoping it would less us run V8/crypto, but instead it just led
+ me to file a fun bug: https://bugs.webkit.org/show_bug.cgi?id=152365.
+
+ * ftl/FTLB3Output.h:
+ (JSC::FTL::Output::check):
+ (JSC::FTL::Output::switchInstruction):
+ (JSC::FTL::Output::ret):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::ftlUnreachable):
+ (JSC::FTL::DFG::LowerDFGToLLVM::crash):
+
</ins><span class="cx"> 2015-12-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix internal Windows build
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLB3Outputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLB3Output.h (194184 => 194185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLB3Output.h 2015-12-16 23:41:05 UTC (rev 194184)
+++ trunk/Source/JavaScriptCore/ftl/FTLB3Output.h 2015-12-16 23:59:13 UTC (rev 194185)
</span><span class="lines">@@ -413,7 +413,16 @@
</span><span class="cx"> void check(LValue condition, WeightedTarget taken) { CRASH(); }
</span><span class="cx">
</span><span class="cx"> template<typename VectorType>
</span><del>- void switchInstruction(LValue value, const VectorType& cases, LBasicBlock fallThrough, Weight fallThroughWeight) { CRASH(); }
</del><ins>+ void switchInstruction(LValue value, const VectorType& cases, LBasicBlock fallThrough, Weight fallThroughWeight)
+ {
+ B3::SwitchValue* switchValue = m_block->appendNew<B3::SwitchValue>(
+ m_proc, origin(), value, B3::FrequentedBlock(fallThrough));
+ for (const SwitchCase& switchCase : cases) {
+ int64_t value = switchCase.value()->asInt();
+ B3::FrequentedBlock target(switchCase.target(), switchCase.weight().frequencyClass());
+ switchValue->appendCase(B3::SwitchCase(value, target));
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> void ret(LValue value) { m_block->appendNew<B3::ControlValue>(m_proc, B3::Return, origin(), value); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (194184 => 194185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-16 23:41:05 UTC (rev 194184)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-16 23:59:13 UTC (rev 194185)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> {
</span><span class="cx"> CRASH();
</span><span class="cx"> }
</span><del>-#elif !FTL_USES_B3
</del><ins>+#else
</ins><span class="cx"> NO_RETURN_DUE_TO_CRASH static void ftlUnreachable(
</span><span class="cx"> CodeBlock* codeBlock, BlockIndex blockIndex, unsigned nodeIndex)
</span><span class="cx"> {
</span><span class="lines">@@ -10065,23 +10065,20 @@
</span><span class="cx"> UNUSED_PARAM(blockIndex);
</span><span class="cx"> UNUSED_PARAM(nodeIndex);
</span><span class="cx"> #else
</span><del>-#if FTL_USES_B3
- UNUSED_PARAM(blockIndex);
- UNUSED_PARAM(nodeIndex);
- if (verboseCompilationEnabled() || !verboseCompilationEnabled())
- CRASH();
-#else
</del><span class="cx"> m_out.call(
</span><span class="cx"> m_out.voidType,
</span><ins>+#if FTL_USES_B3
+ m_out.constIntPtr(ftlUnreachable),
+#else // FTL_USES_B3
</ins><span class="cx"> m_out.intToPtr(
</span><span class="cx"> m_out.constIntPtr(ftlUnreachable),
</span><span class="cx"> pointerType(
</span><span class="cx"> functionType(
</span><span class="cx"> m_out.voidType, m_out.intPtr, m_out.int32, m_out.int32))),
</span><ins>+#endif // FTL_USES_B3
</ins><span class="cx"> m_out.constIntPtr(codeBlock()), m_out.constInt32(blockIndex),
</span><span class="cx"> m_out.constInt32(nodeIndex));
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> m_out.unreachable();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>