<!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>[193424] 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/193424">193424</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2015-12-04 10:45:43 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add an option to emit instructions validating exceptions in the DFG rather than always emiting them.
https://bugs.webkit.org/show_bug.cgi?id=151841
Reviewed by Saam Barati.
Add a new option that validates the DFG execption checking. The default value for the option is
true in Debug builds and false in Release builds. Additionally, renamed jitAssertNoException to
jitReleaseAssertNoException for consistency with our ASSERT naming convention.
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileCurrentBlock):
* jit/AssemblyHelpers.cpp:
(JSC::AssemblyHelpers::jitReleaseAssertNoException):
(JSC::AssemblyHelpers::jitAssertNoException): Deleted.
* jit/AssemblyHelpers.h:
(JSC::AssemblyHelpers::jitAssertNoException): Deleted.
* runtime/Options.cpp:
(JSC::recomputeDependentOptions):
* runtime/Options.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitAssemblyHelperscpp">trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitAssemblyHelpersh">trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionscpp">trunk/Source/JavaScriptCore/runtime/Options.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (193423 => 193424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-04 18:08:27 UTC (rev 193423)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-04 18:45:43 UTC (rev 193424)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-12-04 Keith Miller <keith_miller@apple.com>
+
+ Add an option to emit instructions validating exceptions in the DFG rather than always emiting them.
+ https://bugs.webkit.org/show_bug.cgi?id=151841
+
+ Reviewed by Saam Barati.
+
+ Add a new option that validates the DFG execption checking. The default value for the option is
+ true in Debug builds and false in Release builds. Additionally, renamed jitAssertNoException to
+ jitReleaseAssertNoException for consistency with our ASSERT naming convention.
+
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileCurrentBlock):
+ * jit/AssemblyHelpers.cpp:
+ (JSC::AssemblyHelpers::jitReleaseAssertNoException):
+ (JSC::AssemblyHelpers::jitAssertNoException): Deleted.
+ * jit/AssemblyHelpers.h:
+ (JSC::AssemblyHelpers::jitAssertNoException): Deleted.
+ * runtime/Options.cpp:
+ (JSC::recomputeDependentOptions):
+ * runtime/Options.h:
+
</ins><span class="cx"> 2015-12-04 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix the !ENABLE(DFG_JIT) build after r190735
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (193423 => 193424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-12-04 18:08:27 UTC (rev 193423)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-12-04 18:45:43 UTC (rev 193424)
</span><span class="lines">@@ -1494,9 +1494,10 @@
</span><span class="cx"> m_currentNode->origin.semantic.bytecodeIndex, m_jit.debugOffset());
</span><span class="cx"> dataLog("\n");
</span><span class="cx"> }
</span><del>-
- m_jit.jitAssertNoException();
</del><span class="cx">
</span><ins>+ if (Options::validateDFGExceptionHandling() && mayExit(m_jit.graph(), m_currentNode) != DoesNotExit)
+ m_jit.jitReleaseAssertNoException();
+
</ins><span class="cx"> compile(m_currentNode);
</span><span class="cx">
</span><span class="cx"> if (belongsInMinifiedGraph(m_currentNode->op()))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitAssemblyHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp (193423 => 193424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp 2015-12-04 18:08:27 UTC (rev 193423)
+++ trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp 2015-12-04 18:45:43 UTC (rev 193424)
</span><span class="lines">@@ -299,7 +299,9 @@
</span><span class="cx"> ok.link(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AssemblyHelpers::jitAssertNoException()
</del><ins>+#endif // !ASSERT_DISABLED
+
+void AssemblyHelpers::jitReleaseAssertNoException()
</ins><span class="cx"> {
</span><span class="cx"> Jump noException;
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="lines">@@ -311,8 +313,6 @@
</span><span class="cx"> noException.link(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // !ASSERT_DISABLED
-
</del><span class="cx"> void AssemblyHelpers::callExceptionFuzz()
</span><span class="cx"> {
</span><span class="cx"> if (!Options::useExceptionFuzz())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitAssemblyHelpersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h (193423 => 193424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h 2015-12-04 18:08:27 UTC (rev 193423)
+++ trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h 2015-12-04 18:45:43 UTC (rev 193424)
</span><span class="lines">@@ -995,7 +995,6 @@
</span><span class="cx"> void jitAssertIsNull(GPRReg);
</span><span class="cx"> void jitAssertTagsInPlace();
</span><span class="cx"> void jitAssertArgumentCountSane();
</span><del>- void jitAssertNoException();
</del><span class="cx"> #else
</span><span class="cx"> void jitAssertIsInt32(GPRReg) { }
</span><span class="cx"> void jitAssertIsJSInt32(GPRReg) { }
</span><span class="lines">@@ -1006,8 +1005,9 @@
</span><span class="cx"> void jitAssertIsNull(GPRReg) { }
</span><span class="cx"> void jitAssertTagsInPlace() { }
</span><span class="cx"> void jitAssertArgumentCountSane() { }
</span><del>- void jitAssertNoException() { }
</del><span class="cx"> #endif
</span><ins>+
+ void jitReleaseAssertNoException();
</ins><span class="cx">
</span><span class="cx"> void purifyNaN(FPRReg);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.cpp (193423 => 193424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.cpp 2015-12-04 18:08:27 UTC (rev 193423)
+++ trunk/Source/JavaScriptCore/runtime/Options.cpp 2015-12-04 18:45:43 UTC (rev 193424)
</span><span class="lines">@@ -252,6 +252,9 @@
</span><span class="cx">
</span><span class="cx"> static void recomputeDependentOptions()
</span><span class="cx"> {
</span><ins>+#if !defined(NDEBUG)
+ Options::validateDFGExceptionHandling() = true;
+#endif
</ins><span class="cx"> #if !ENABLE(JIT)
</span><span class="cx"> Options::useLLInt() = true;
</span><span class="cx"> Options::useJIT() = false;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (193423 => 193424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2015-12-04 18:08:27 UTC (rev 193423)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2015-12-04 18:45:43 UTC (rev 193424)
</span><span class="lines">@@ -326,6 +326,7 @@
</span><span class="cx"> \
</span><span class="cx"> v(bool, useExceptionFuzz, false, nullptr) \
</span><span class="cx"> v(unsigned, fireExceptionFuzzAt, 0, nullptr) \
</span><ins>+ v(bool, validateDFGExceptionHandling, false, "Causes the DFG to emit code validating exception handling for each node that can exit") /* This is true by default on Debug builds */\
</ins><span class="cx"> \
</span><span class="cx"> v(bool, useExecutableAllocationFuzz, false, nullptr) \
</span><span class="cx"> v(unsigned, fireExecutableAllocationFuzzAt, 0, nullptr) \
</span></span></pre>
</div>
</div>
</body>
</html>