<!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>[202519] 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/202519">202519</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-06-27 16:26:41 -0700 (Mon, 27 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crashing at an unreachable code trap in FTL should give more information
https://bugs.webkit.org/show_bug.cgi?id=159177
Reviewed by Saam Barati.
This stuffs information into registers so that we have some chance of seeing what happened
by looking at the register dumps.
* assembler/AbortReason.h:
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::ftlUnreachable):
(JSC::FTL::DFG::LowerDFGToB3::compileBlock):
(JSC::FTL::DFG::LowerDFGToB3::crash):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerAbortReasonh">trunk/Source/JavaScriptCore/assembler/AbortReason.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202518 => 202519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-06-27 22:26:41 UTC (rev 202518)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-06-27 23:26:41 UTC (rev 202519)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-06-27 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ Crashing at an unreachable code trap in FTL should give more information
+ https://bugs.webkit.org/show_bug.cgi?id=159177
+
+ Reviewed by Saam Barati.
+
+ This stuffs information into registers so that we have some chance of seeing what happened
+ by looking at the register dumps.
+
+ * assembler/AbortReason.h:
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::ftlUnreachable):
+ (JSC::FTL::DFG::LowerDFGToB3::compileBlock):
+ (JSC::FTL::DFG::LowerDFGToB3::crash):
+
+2016-06-27 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> Clean up resetting reachability in B3/Air
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159170
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerAbortReasonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/AbortReason.h (202518 => 202519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/AbortReason.h        2016-06-27 22:26:41 UTC (rev 202518)
+++ trunk/Source/JavaScriptCore/assembler/AbortReason.h        2016-06-27 23:26:41 UTC (rev 202519)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> DFGUnreachableNode = 225,
</span><span class="cx"> DFGUnreasonableOSREntryJumpDestination = 230,
</span><span class="cx"> DFGVarargsThrowingPathDidNotThrow = 235,
</span><ins>+ FTLCrash = 236,
</ins><span class="cx"> JITDidReturnFromTailCall = 237,
</span><span class="cx"> JITDivOperandsAreNotNumbers = 240,
</span><span class="cx"> JITGetByValResultIsNotEmpty = 250,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (202518 => 202519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp        2016-06-27 22:26:41 UTC (rev 202518)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp        2016-06-27 23:26:41 UTC (rev 202519)
</span><span class="lines">@@ -90,12 +90,7 @@
</span><span class="cx">
</span><span class="cx"> std::atomic<int> compileCounter;
</span><span class="cx">
</span><del>-#if ASSERT_DISABLED
-NO_RETURN_DUE_TO_CRASH static void ftlUnreachable()
-{
- CRASH();
-}
-#else
</del><ins>+#if !ASSERT_DISABLED
</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">@@ -393,7 +388,7 @@
</span><span class="cx"> if (!m_highBlock->cfaHasVisited) {
</span><span class="cx"> if (verboseCompilationEnabled())
</span><span class="cx"> dataLog("Bailing because CFA didn't reach.\n");
</span><del>- crash(m_highBlock->index, UINT_MAX);
</del><ins>+ crash(m_highBlock, nullptr);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -11241,14 +11236,23 @@
</span><span class="cx">
</span><span class="cx"> void crash()
</span><span class="cx"> {
</span><del>- crash(m_highBlock->index, m_node->index());
</del><ins>+ crash(m_highBlock, m_node);
</ins><span class="cx"> }
</span><del>- void crash(BlockIndex blockIndex, unsigned nodeIndex)
</del><ins>+ void crash(DFG::BasicBlock* block, Node* node)
</ins><span class="cx"> {
</span><ins>+ BlockIndex blockIndex = block->index;
+ unsigned nodeIndex = node ? node->index() : UINT_MAX;
</ins><span class="cx"> #if ASSERT_DISABLED
</span><del>- m_out.call(m_out.voidType, m_out.operation(ftlUnreachable));
- UNUSED_PARAM(blockIndex);
- UNUSED_PARAM(nodeIndex);
</del><ins>+ m_out.patchpoint(Void)->setGenerator(
+ [=] (CCallHelpers& jit, const StackmapGenerationParams&) {
+ AllowMacroScratchRegisterUsage allowScratch(jit);
+
+ jit.move(CCallHelpers::TrustedImm32(blockIndex), GPRInfo::regT0);
+ jit.move(CCallHelpers::TrustedImm32(nodeIndex), GPRInfo::regT1);
+ if (node)
+ jit.move(CCallHelpers::TrustedImm32(node->op()), GPRInfo::regT2);
+ jit.abortWithReason(FTLCrash);
+ });
</ins><span class="cx"> #else
</span><span class="cx"> m_out.call(
</span><span class="cx"> m_out.voidType,
</span></span></pre>
</div>
</div>
</body>
</html>