<!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>[169942] 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/169942">169942</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-06-13 11:56:58 -0700 (Fri, 13 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Even better diagnostics from DFG traps
https://bugs.webkit.org/show_bug.cgi?id=133836
Reviewed by Oliver Hunt.
We now stuff the DFG::NodeType into a register before bailing. Also made the
DFGBailed abort reason a bit more specific. As planned, the new abort reasons use
different numbers than any previous abort reasons.
* assembler/AbortReason.h:
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::abortWithReason):
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::abortWithReason):
* assembler/MacroAssemblerX86.h:
(JSC::MacroAssemblerX86::abortWithReason):
* assembler/MacroAssemblerX86_64.h:
(JSC::MacroAssemblerX86_64::abortWithReason):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::SpeculativeJIT):
(JSC::DFG::SpeculativeJIT::bail):
(JSC::DFG::SpeculativeJIT::compileCurrentBlock):
* dfg/DFGSpeculativeJIT.h:</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="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITh">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (169941 => 169942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-06-13 18:56:29 UTC (rev 169941)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-06-13 18:56:58 UTC (rev 169942)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-06-12 Filip Pizlo <fpizlo@apple.com>
+
+ Even better diagnostics from DFG traps
+ https://bugs.webkit.org/show_bug.cgi?id=133836
+
+ Reviewed by Oliver Hunt.
+
+ We now stuff the DFG::NodeType into a register before bailing. Also made the
+ DFGBailed abort reason a bit more specific. As planned, the new abort reasons use
+ different numbers than any previous abort reasons.
+
+ * assembler/AbortReason.h:
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::abortWithReason):
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::abortWithReason):
+ * assembler/MacroAssemblerX86.h:
+ (JSC::MacroAssemblerX86::abortWithReason):
+ * assembler/MacroAssemblerX86_64.h:
+ (JSC::MacroAssemblerX86_64::abortWithReason):
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::SpeculativeJIT):
+ (JSC::DFG::SpeculativeJIT::bail):
+ (JSC::DFG::SpeculativeJIT::compileCurrentBlock):
+ * dfg/DFGSpeculativeJIT.h:
+
</ins><span class="cx"> 2014-06-12 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix assertions under JSC::setNeverInline() when running js tests in WebKitTestRunner
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerAbortReasonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/AbortReason.h (169941 => 169942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/AbortReason.h 2014-06-13 18:56:29 UTC (rev 169941)
+++ trunk/Source/JavaScriptCore/assembler/AbortReason.h 2014-06-13 18:56:58 UTC (rev 169942)
</span><span class="lines">@@ -48,7 +48,8 @@
</span><span class="cx"> AHTagTypeNumberNotInPlace = 130,
</span><span class="cx"> AHTypeInfoInlineTypeFlagsAreValid = 140,
</span><span class="cx"> AHTypeInfoIsValid = 150,
</span><del>- DFGBailed = 160,
</del><ins>+ DFGBailedAtTopOfBlock = 161,
+ DFGBailedAtEndOfNode = 162,
</ins><span class="cx"> DFGBasicStorageAllocatorZeroSize = 170,
</span><span class="cx"> DFGIsNotCell = 180,
</span><span class="cx"> DFGIneffectiveWatchpoint = 190,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (169941 => 169942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2014-06-13 18:56:29 UTC (rev 169941)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2014-06-13 18:56:58 UTC (rev 169942)
</span><span class="lines">@@ -812,6 +812,12 @@
</span><span class="cx"> breakpoint();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void abortWithReason(AbortReason reason, intptr_t misc)
+ {
+ move(TrustedImm64(misc), memoryTempRegister);
+ abortWithReason(reason);
+ }
+
</ins><span class="cx"> ConvertibleLoadLabel convertibleLoadPtr(Address address, RegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> ConvertibleLoadLabel result(this);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (169941 => 169942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2014-06-13 18:56:29 UTC (rev 169941)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2014-06-13 18:56:58 UTC (rev 169942)
</span><span class="lines">@@ -638,6 +638,12 @@
</span><span class="cx"> breakpoint();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void abortWithReason(AbortReason reason, intptr_t misc)
+ {
+ move(TrustedImm32(misc), memoryTempRegister);
+ abortWithReason(reason);
+ }
+
</ins><span class="cx"> ConvertibleLoadLabel convertibleLoadPtr(Address address, RegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> ConvertibleLoadLabel result(this);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h (169941 => 169942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h 2014-06-13 18:56:29 UTC (rev 169941)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h 2014-06-13 18:56:58 UTC (rev 169942)
</span><span class="lines">@@ -117,6 +117,12 @@
</span><span class="cx"> breakpoint();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void abortWithReason(AbortReason reason, intptr_t misc)
+ {
+ move(TrustedImm32(misc), X86Registers::edx);
+ abortWithReason(reason);
+ }
+
</ins><span class="cx"> ConvertibleLoadLabel convertibleLoadPtr(Address address, RegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> ConvertibleLoadLabel result = ConvertibleLoadLabel(this);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h (169941 => 169942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2014-06-13 18:56:29 UTC (rev 169941)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2014-06-13 18:56:58 UTC (rev 169942)
</span><span class="lines">@@ -635,6 +635,12 @@
</span><span class="cx"> breakpoint();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void abortWithReason(AbortReason reason, intptr_t misc)
+ {
+ move(TrustedImm64(misc), X86Registers::r10);
+ abortWithReason(reason);
+ }
+
</ins><span class="cx"> ConvertibleLoadLabel convertibleLoadPtr(Address address, RegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> ConvertibleLoadLabel result = ConvertibleLoadLabel(this);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (169941 => 169942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-06-13 18:56:29 UTC (rev 169941)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-06-13 18:56:58 UTC (rev 169942)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> : m_compileOkay(true)
</span><span class="cx"> , m_jit(jit)
</span><span class="cx"> , m_currentNode(0)
</span><ins>+ , m_lastGeneratedNode(LastNodeType)
</ins><span class="cx"> , m_indexInBlock(0)
</span><span class="cx"> , m_generationInfo(m_jit.graph().frameRegisterCount())
</span><span class="cx"> , m_state(m_jit.graph())
</span><span class="lines">@@ -1338,10 +1339,10 @@
</span><span class="cx"> m_stream->appendAndLog(VariableEvent::movHint(MinifiedID(child), node->unlinkedLocal()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SpeculativeJIT::bail()
</del><ins>+void SpeculativeJIT::bail(AbortReason reason)
</ins><span class="cx"> {
</span><span class="cx"> m_compileOkay = true;
</span><del>- m_jit.abortWithReason(DFGBailed);
</del><ins>+ m_jit.abortWithReason(reason, m_lastGeneratedNode);
</ins><span class="cx"> clearGenerationInfo();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1397,10 +1398,10 @@
</span><span class="cx"> for (m_indexInBlock = 0; m_indexInBlock < m_block->size(); ++m_indexInBlock) {
</span><span class="cx"> m_currentNode = m_block->at(m_indexInBlock);
</span><span class="cx">
</span><del>- // We may have his a contradiction that the CFA was aware of but that the JIT
</del><ins>+ // We may have hit a contradiction that the CFA was aware of but that the JIT
</ins><span class="cx"> // didn't cause directly.
</span><span class="cx"> if (!m_state.isValid()) {
</span><del>- bail();
</del><ins>+ bail(DFGBailedAtTopOfBlock);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1409,6 +1410,7 @@
</span><span class="cx"> m_jit.setForNode(m_currentNode);
</span><span class="cx"> m_codeOriginForExitTarget = m_currentNode->origin.forExit;
</span><span class="cx"> m_codeOriginForExitProfile = m_currentNode->origin.semantic;
</span><ins>+ m_lastGeneratedNode = m_currentNode->op();
</ins><span class="cx"> if (!m_currentNode->shouldGenerate()) {
</span><span class="cx"> switch (m_currentNode->op()) {
</span><span class="cx"> case JSConstant:
</span><span class="lines">@@ -1455,7 +1457,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!m_compileOkay) {
</span><del>- bail();
</del><ins>+ bail(DFGBailedAtEndOfNode);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h (169941 => 169942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2014-06-13 18:56:29 UTC (rev 169941)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2014-06-13 18:56:58 UTC (rev 169942)
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx">
</span><span class="cx"> void compile(Node*);
</span><span class="cx"> void noticeOSRBirth(Node*);
</span><del>- void bail();
</del><ins>+ void bail(AbortReason);
</ins><span class="cx"> void compileCurrentBlock();
</span><span class="cx">
</span><span class="cx"> void checkArgumentTypes();
</span><span class="lines">@@ -2309,6 +2309,7 @@
</span><span class="cx"> // The current node being generated.
</span><span class="cx"> BasicBlock* m_block;
</span><span class="cx"> Node* m_currentNode;
</span><ins>+ NodeType m_lastGeneratedNode;
</ins><span class="cx"> bool m_canExit;
</span><span class="cx"> unsigned m_indexInBlock;
</span><span class="cx"> // Virtual and physical register maps.
</span></span></pre>
</div>
</div>
</body>
</html>