<!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>[194786] 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/194786">194786</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-01-08 13:42:23 -0800 (Fri, 08 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL B3 compile() doesn't clear exception handlers before we add FTL-specific ones
https://bugs.webkit.org/show_bug.cgi?id=152922
Reviewed by Saam Barati.
FTL B3 was generating a handler table that first contained the old baseline handlers keyed
by baseline's bytecode indices and then the FTL handlers keyed by FTL callsite index. That's
wrong, since the FTL code block should not contain any baseline handlers. The fix is to
clear the handlers before generation, sort of like FTL LLVM does.
Also added some stuff to make it easier to inspect the handler table.
This reduces the numbe rof failures from 25 to 13.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dumpBytecode):
(JSC::CodeBlock::dumpExceptionHandlers):
(JSC::CodeBlock::beginDumpProfiling):
* bytecode/CodeBlock.h:
* ftl/FTLB3Compile.cpp:
(JSC::FTL::compile):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockh">trunk/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLB3Compilecpp">trunk/Source/JavaScriptCore/ftl/FTLB3Compile.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194785 => 194786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-08 21:33:59 UTC (rev 194785)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-08 21:42:23 UTC (rev 194786)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-01-08 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ FTL B3 compile() doesn't clear exception handlers before we add FTL-specific ones
+ https://bugs.webkit.org/show_bug.cgi?id=152922
+
+ Reviewed by Saam Barati.
+
+ FTL B3 was generating a handler table that first contained the old baseline handlers keyed
+ by baseline's bytecode indices and then the FTL handlers keyed by FTL callsite index. That's
+ wrong, since the FTL code block should not contain any baseline handlers. The fix is to
+ clear the handlers before generation, sort of like FTL LLVM does.
+
+ Also added some stuff to make it easier to inspect the handler table.
+
+ This reduces the numbe rof failures from 25 to 13.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dumpBytecode):
+ (JSC::CodeBlock::dumpExceptionHandlers):
+ (JSC::CodeBlock::beginDumpProfiling):
+ * bytecode/CodeBlock.h:
+ * ftl/FTLB3Compile.cpp:
+ (JSC::FTL::compile):
+
+2016-01-08 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> B3 incorrectly turns NotEqual(bool, 1) into Equal(bool, 1) instead of Equal(bool, 0)
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152916
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (194785 => 194786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-01-08 21:33:59 UTC (rev 194785)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2016-01-08 21:42:23 UTC (rev 194786)
</span><span class="lines">@@ -639,16 +639,7 @@
</span><span class="cx"> } while (i < count);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_rareData && !m_rareData->m_exceptionHandlers.isEmpty()) {
- out.printf("\nException Handlers:\n");
- unsigned i = 0;
- do {
- HandlerInfo& handler = m_rareData->m_exceptionHandlers[i];
- out.printf("\t %d: { start: [%4d] end: [%4d] target: [%4d] } %s\n",
- i + 1, handler.start, handler.end, handler.target, handler.typeName());
- ++i;
- } while (i < m_rareData->m_exceptionHandlers.size());
- }
</del><ins>+ dumpExceptionHandlers(out);
</ins><span class="cx">
</span><span class="cx"> if (m_rareData && !m_rareData->m_switchJumpTables.isEmpty()) {
</span><span class="cx"> out.printf("Switch Jump Tables:\n");
</span><span class="lines">@@ -695,6 +686,20 @@
</span><span class="cx"> out.printf("\n");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CodeBlock::dumpExceptionHandlers(PrintStream& out)
+{
+ if (m_rareData && !m_rareData->m_exceptionHandlers.isEmpty()) {
+ out.printf("\nException Handlers:\n");
+ unsigned i = 0;
+ do {
+ HandlerInfo& handler = m_rareData->m_exceptionHandlers[i];
+ out.printf("\t %d: { start: [%4d] end: [%4d] target: [%4d] } %s\n",
+ i + 1, handler.start, handler.end, handler.target, handler.typeName());
+ ++i;
+ } while (i < m_rareData->m_exceptionHandlers.size());
+ }
+}
+
</ins><span class="cx"> void CodeBlock::beginDumpProfiling(PrintStream& out, bool& hasPrintedProfiling)
</span><span class="cx"> {
</span><span class="cx"> if (hasPrintedProfiling) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (194785 => 194786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2016-01-08 21:33:59 UTC (rev 194785)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2016-01-08 21:42:23 UTC (rev 194786)
</span><span class="lines">@@ -192,6 +192,7 @@
</span><span class="cx"> void dumpBytecode(
</span><span class="cx"> PrintStream&, unsigned bytecodeOffset,
</span><span class="cx"> const StubInfoMap& = StubInfoMap(), const CallLinkInfoMap& = CallLinkInfoMap());
</span><ins>+ void dumpExceptionHandlers(PrintStream&);
</ins><span class="cx"> void printStructures(PrintStream&, const Instruction*);
</span><span class="cx"> void printStructure(PrintStream&, const char* name, const Instruction*, int operand);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLB3Compilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLB3Compile.cpp (194785 => 194786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLB3Compile.cpp 2016-01-08 21:33:59 UTC (rev 194785)
+++ trunk/Source/JavaScriptCore/ftl/FTLB3Compile.cpp 2016-01-08 21:42:23 UTC (rev 194786)
</span><span class="lines">@@ -109,6 +109,9 @@
</span><span class="cx"> materialization->accountForLocalsOffset(localsOffset);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // We will add exception handlers while generating.
+ codeBlock->clearExceptionHandlers();
+
</ins><span class="cx"> CCallHelpers jit(&vm, codeBlock);
</span><span class="cx"> B3::generate(*state.proc, jit);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>