<!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>[194655] 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/194655">194655</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-01-06 12:49:32 -0800 (Wed, 06 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure that the basic throw-from-operation mode of throwing makes sense in FTL B3
https://bugs.webkit.org/show_bug.cgi?id=152798
Reviewed by Oliver Hunt.
This really just contains one change: we inline emitBranchToOSRExitIfWillCatchException()
into callCheck(), since that was its only caller. This makes it a bit more clear what is
going on.
It turns out that FTL B3 already handled this case properly. I added a test that I believe
illustrates this. Note that although the test uses GetById, which ordinarily throws
exceptions from inside a patchpoint, it uses it in such a way that the exception is thrown
from the operation call for the non-cell bypass path of a GetById(UntypedUse:).
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::callCheck):
(JSC::FTL::DFG::LowerDFGToLLVM::appendOSRExitArgumentsForPatchpointIfWillCatchException):
(JSC::FTL::DFG::LowerDFGToLLVM::lowBlock):
(JSC::FTL::DFG::LowerDFGToLLVM::emitBranchToOSRExitIfWillCatchException): Deleted.
* tests/stress/ftl-operation-exception.js: Added.
(foo):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressftloperationexceptionjs">trunk/Source/JavaScriptCore/tests/stress/ftl-operation-exception.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194654 => 194655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-06 20:31:42 UTC (rev 194654)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-06 20:49:32 UTC (rev 194655)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-01-06 Filip Pizlo <fpizlo@apple.com>
+
+ Make sure that the basic throw-from-operation mode of throwing makes sense in FTL B3
+ https://bugs.webkit.org/show_bug.cgi?id=152798
+
+ Reviewed by Oliver Hunt.
+
+ This really just contains one change: we inline emitBranchToOSRExitIfWillCatchException()
+ into callCheck(), since that was its only caller. This makes it a bit more clear what is
+ going on.
+
+ It turns out that FTL B3 already handled this case properly. I added a test that I believe
+ illustrates this. Note that although the test uses GetById, which ordinarily throws
+ exceptions from inside a patchpoint, it uses it in such a way that the exception is thrown
+ from the operation call for the non-cell bypass path of a GetById(UntypedUse:).
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::callCheck):
+ (JSC::FTL::DFG::LowerDFGToLLVM::appendOSRExitArgumentsForPatchpointIfWillCatchException):
+ (JSC::FTL::DFG::LowerDFGToLLVM::lowBlock):
+ (JSC::FTL::DFG::LowerDFGToLLVM::emitBranchToOSRExitIfWillCatchException): Deleted.
+ * tests/stress/ftl-operation-exception.js: Added.
+ (foo):
+
</ins><span class="cx"> 2016-01-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove duplicate check
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (194654 => 194655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-01-06 20:31:42 UTC (rev 194654)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-01-06 20:49:32 UTC (rev 194655)
</span><span class="lines">@@ -10113,9 +10113,16 @@
</span><span class="cx"> LValue exception = m_out.load64(m_out.absolute(vm().addressOfException()));
</span><span class="cx"> LValue hadException = m_out.notZero64(exception);
</span><span class="cx">
</span><del>- bool emittedExceptionHandlingCodeForOSRExit = emitBranchToOSRExitIfWillCatchException(hadException);
- if (emittedExceptionHandlingCodeForOSRExit) // It already took care of exception handling logic.
</del><ins>+ CodeOrigin opCatchOrigin;
+ HandlerInfo* exceptionHandler;
+ if (m_graph.willCatchExceptionInMachineFrame(m_origin.forExit, opCatchOrigin, exceptionHandler)) {
+ bool exitOK = true;
+ bool isExceptionHandler = true;
+ appendOSRExit(
+ Uncountable, noValue(), nullptr, hadException,
+ m_origin.withForExitAndExitOK(opCatchOrigin, exitOK), isExceptionHandler);
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("Exception check continuation"));
</span><span class="cx">
</span><span class="lines">@@ -10148,18 +10155,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // !FTL_USES_B3
</span><span class="cx">
</span><del>- bool emitBranchToOSRExitIfWillCatchException(LValue hadException)
- {
- CodeOrigin opCatchOrigin;
- HandlerInfo* exceptionHandler;
- bool willCatchException = m_graph.willCatchExceptionInMachineFrame(m_origin.forExit, opCatchOrigin, exceptionHandler);
- if (!willCatchException)
- return false;
-
- appendOSRExit(Uncountable, noValue(), nullptr, hadException, m_origin.withForExitAndExitOK(opCatchOrigin, true), true);
- return true;
- }
-
</del><span class="cx"> LBasicBlock lowBlock(DFG::BasicBlock* block)
</span><span class="cx"> {
</span><span class="cx"> return m_blocks.get(block);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressftloperationexceptionjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/ftl-operation-exception.js (0 => 194655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/ftl-operation-exception.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/ftl-operation-exception.js 2016-01-06 20:49:32 UTC (rev 194655)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+function foo(o, p) {
+ var x = 100;
+ var result = 101;
+ try {
+ x = 102;
+ p = 103;
+ result = o.f;
+ o = 104;
+ p = 105;
+ x = 106;
+ } catch (e) {
+ return {outcome: "exception", values: [o, p, x, result]};
+ }
+ return {outcome: "return", values: [o, p, x, result]};
+}
+
+noInline(foo);
+
+// Warm up foo() with polymorphic objects and non-object types.
+for (var i = 0; i < 100000; ++i) {
+ var o;
+ var isObject = i & 1;
+ if (isObject) {
+ o = {f:107};
+ o["i" + i] = i; // Make it polymorphic.
+ } else
+ o = 42;
+ var result = foo(o);
+ if (result.outcome !== "return")
+ throw "Error in loop: bad outcome: " + result.outcome;
+ if (result.values.length !== 4)
+ throw "Error in loop: bad number of values: " + result.values.length;
+ if (result.values[0] !== 104)
+ throw "Error in loop: bad values[0]: " + result.values[0];
+ if (result.values[1] !== 105)
+ throw "Error in loop: bad values[1]: " + result.values[1];
+ if (result.values[2] !== 106)
+ throw "Error in loop: bad values[2]: " + result.values[2];
+ if (isObject) {
+ if (result.values[3] !== 107)
+ throw "Error in loop: bad values[3]: " + result.values[3];
+ } else {
+ if (result.values[3] !== void 0)
+ throw "Error in loop: bad values[3]: " + result.values[3];
+ }
+}
+
+// Now throw an exception.
+var result = foo(null, 108);
+if (result.outcome !== "exception")
+ throw "Error at end: bad outcome: " + result.outcome;
+if (result.values.length !== 4)
+ throw "Error at end: bad number of values: " + result.values.length;
+if (result.values[0] !== null)
+ throw "Error at end: bad values[0]: " + result.values[0];
+if (result.values[1] !== 103)
+ throw "Error at end: bad values[1]: " + result.values[1];
+if (result.values[2] !== 102)
+ throw "Error at end: bad values[2]: " + result.values[2];
+if (result.values[3] !== 101)
+ throw "Error at end: bad values[3]: " + result.values[3];
+
</ins></span></pre>
</div>
</div>
</body>
</html>