<!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>[194748] 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/194748">194748</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-01-07 17:52:31 -0800 (Thu, 07 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL B3 lazy slow paths should do exceptions
https://bugs.webkit.org/show_bug.cgi?id=152853
Reviewed by Saam Barati.
This reduces the number of JSC test failures to 97.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::lazySlowPath):
* tests/stress/ftl-new-negative-array-size.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="#trunkSourceJavaScriptCoretestsstressftlnewnegativearraysizejs">trunk/Source/JavaScriptCore/tests/stress/ftl-new-negative-array-size.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194747 => 194748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-08 01:38:50 UTC (rev 194747)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-08 01:52:31 UTC (rev 194748)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-01-07 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ FTL B3 lazy slow paths should do exceptions
+ https://bugs.webkit.org/show_bug.cgi?id=152853
+
+ Reviewed by Saam Barati.
+
+ This reduces the number of JSC test failures to 97.
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::lazySlowPath):
+ * tests/stress/ftl-new-negative-array-size.js: Added.
+ (foo):
+
+2016-01-07 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> Unreviewed, skip more tests that fail.
</span><span class="cx">
</span><span class="cx"> * tests/stress/ftl-shr-exception.js:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (194747 => 194748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-01-08 01:38:50 UTC (rev 194747)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-01-08 01:52:31 UTC (rev 194748)
</span><span class="lines">@@ -8840,11 +8840,12 @@
</span><span class="cx"> #if FTL_USES_B3
</span><span class="cx"> CodeOrigin origin = m_node->origin.semantic;
</span><span class="cx">
</span><del>- B3::PatchpointValue* result = m_out.patchpoint(B3::Int64);
</del><ins>+ PatchpointValue* result = m_out.patchpoint(B3::Int64);
</ins><span class="cx"> for (LValue arg : userArguments)
</span><span class="cx"> result->append(ConstrainedValue(arg, B3::ValueRep::SomeRegister));
</span><span class="cx">
</span><del>- // FIXME: As part of handling exceptions, we need to append OSR exit state here.
</del><ins>+ RefPtr<PatchpointExceptionHandle> exceptionHandle =
+ preparePatchpointForExceptions(result);
</ins><span class="cx">
</span><span class="cx"> result->clobber(RegisterSet::macroScratchRegisters());
</span><span class="cx"> State* state = &m_ftlState;
</span><span class="lines">@@ -8862,6 +8863,9 @@
</span><span class="cx">
</span><span class="cx"> RegisterSet usedRegisters = params.unavailableRegisters();
</span><span class="cx">
</span><ins>+ RefPtr<ExceptionTarget> exceptionTarget =
+ exceptionHandle->scheduleExitCreation(params);
+
</ins><span class="cx"> // FIXME: As part of handling exceptions, we need to create a concrete OSRExit here.
</span><span class="cx"> // Doing so should automagically register late paths that emit exit thunks.
</span><span class="cx">
</span><span class="lines">@@ -8893,18 +8897,14 @@
</span><span class="cx"> linkBuffer.locationOf(patchableJump));
</span><span class="cx"> CodeLocationLabel linkedDone = linkBuffer.locationOf(done);
</span><span class="cx">
</span><del>- // FIXME: Need a story for exceptions in FTL-B3. That basically means
- // doing a lookup of the exception entrypoint here. We will have an
- // OSR exit data structure of some sort.
- // https://bugs.webkit.org/show_bug.cgi?id=151686
- CodeLocationLabel exceptionTarget;
</del><span class="cx"> CallSiteIndex callSiteIndex =
</span><span class="cx"> jitCode->common.addUniqueCallSiteIndex(origin);
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<LazySlowPath> lazySlowPath =
</span><span class="cx"> std::make_unique<LazySlowPath>(
</span><del>- linkedPatchableJump, linkedDone, exceptionTarget,
- usedRegisters, callSiteIndex, generator);
</del><ins>+ linkedPatchableJump, linkedDone,
+ exceptionTarget->label(linkBuffer), usedRegisters,
+ callSiteIndex, generator);
</ins><span class="cx">
</span><span class="cx"> jitCode->lazySlowPaths[index] = WTFMove(lazySlowPath);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressftlnewnegativearraysizejs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/ftl-new-negative-array-size.js (0 => 194748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/ftl-new-negative-array-size.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/ftl-new-negative-array-size.js 2016-01-08 01:52:31 UTC (rev 194748)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+function foo(arg) {
+ try {
+ return new Array(arg);
+ } catch (e) {
+ return "error42";
+ }
+}
+
+noInline(foo);
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo(1);
+ if (result.length != 1)
+ throw "Error: bad result: " + result;
+}
+
+var result = foo(-1);
+if (result != "error42")
+ throw "Error: bad result at end: " + result;
+
</ins></span></pre>
</div>
</div>
</body>
</html>