<!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>[194746] 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/194746">194746</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-01-07 17:10:15 -0800 (Thu, 07 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL B3 binary snippets should do exceptions
https://bugs.webkit.org/show_bug.cgi?id=152852
Reviewed by Saam Barati.
This reduces the number of JSC test failures to 110.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::emitBinarySnippet):
(JSC::FTL::DFG::LowerDFGToLLVM::emitBinaryBitOpSnippet):
(JSC::FTL::DFG::LowerDFGToLLVM::emitRightShiftSnippet):
* tests/stress/ftl-shr-exception.js: Added.
(foo):
(result.foo.valueOf):
* tests/stress/ftl-sub-exception.js: Added.
(foo):
(result.foo.valueOf):
* tests/stress/ftl-xor-exception.js: Added.
(foo):
(result.foo.valueOf):</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="#trunkSourceJavaScriptCoretestsstressftlshrexceptionjs">trunk/Source/JavaScriptCore/tests/stress/ftl-shr-exception.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressftlsubexceptionjs">trunk/Source/JavaScriptCore/tests/stress/ftl-sub-exception.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressftlxorexceptionjs">trunk/Source/JavaScriptCore/tests/stress/ftl-xor-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 (194745 => 194746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-08 01:05:47 UTC (rev 194745)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-08 01:10:15 UTC (rev 194746)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2016-01-07 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ FTL B3 binary snippets should do exceptions
+ https://bugs.webkit.org/show_bug.cgi?id=152852
+
+ Reviewed by Saam Barati.
+
+ This reduces the number of JSC test failures to 110.
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::emitBinarySnippet):
+ (JSC::FTL::DFG::LowerDFGToLLVM::emitBinaryBitOpSnippet):
+ (JSC::FTL::DFG::LowerDFGToLLVM::emitRightShiftSnippet):
+ * tests/stress/ftl-shr-exception.js: Added.
+ (foo):
+ (result.foo.valueOf):
+ * tests/stress/ftl-sub-exception.js: Added.
+ (foo):
+ (result.foo.valueOf):
+ * tests/stress/ftl-xor-exception.js: Added.
+ (foo):
+ (result.foo.valueOf):
+
+2016-01-07 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> Unreviewed, skipping this test. Looks like LLVM can't handle this one, either.
</span><span class="cx">
</span><span class="cx"> * tests/stress/ftl-call-varargs-bad-args-exception-interesting-live-state.js:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (194745 => 194746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-01-08 01:05:47 UTC (rev 194745)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-01-08 01:10:15 UTC (rev 194746)
</span><span class="lines">@@ -7549,9 +7549,6 @@
</span><span class="cx"> {
</span><span class="cx"> Node* node = m_node;
</span><span class="cx">
</span><del>- // FIXME: Make this do exceptions.
- // https://bugs.webkit.org/show_bug.cgi?id=151686
-
</del><span class="cx"> LValue left = lowJSValue(node->child1());
</span><span class="cx"> LValue right = lowJSValue(node->child2());
</span><span class="cx">
</span><span class="lines">@@ -7563,6 +7560,8 @@
</span><span class="cx"> patchpoint->appendSomeRegister(right);
</span><span class="cx"> patchpoint->append(m_tagMask, ValueRep::reg(GPRInfo::tagMaskRegister));
</span><span class="cx"> patchpoint->append(m_tagTypeNumber, ValueRep::reg(GPRInfo::tagTypeNumberRegister));
</span><ins>+ RefPtr<PatchpointExceptionHandle> exceptionHandle =
+ preparePatchpointForExceptions(patchpoint);
</ins><span class="cx"> patchpoint->numGPScratchRegisters = 1;
</span><span class="cx"> patchpoint->numFPScratchRegisters = 2;
</span><span class="cx"> if (scratchFPRUsage == NeedScratchFPR)
</span><span class="lines">@@ -7572,6 +7571,9 @@
</span><span class="cx"> patchpoint->setGenerator(
</span><span class="cx"> [=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
</span><span class="cx"> AllowMacroScratchRegisterUsage allowScratch(jit);
</span><ins>+
+ Box<CCallHelpers::JumpList> exceptions =
+ exceptionHandle->scheduleExitCreation(params)->jumps(jit);
</ins><span class="cx">
</span><span class="cx"> auto generator = Box<BinaryArithOpGenerator>::create(
</span><span class="cx"> leftOperand, rightOperand, JSValueRegs(params[0].gpr()),
</span><span class="lines">@@ -7587,14 +7589,11 @@
</span><span class="cx"> [=] (CCallHelpers& jit) {
</span><span class="cx"> AllowMacroScratchRegisterUsage allowScratch(jit);
</span><span class="cx">
</span><del>- // FIXME: Make this do something.
- CCallHelpers::JumpList exceptions;
-
</del><span class="cx"> generator->slowPathJumpList().link(&jit);
</span><span class="cx"> callOperation(
</span><span class="cx"> *state, params.unavailableRegisters(), jit, node->origin.semantic,
</span><del>- &exceptions, slowPathFunction, params[0].gpr(), params[1].gpr(),
- params[2].gpr());
</del><ins>+ exceptions.get(), slowPathFunction, params[0].gpr(),
+ params[1].gpr(), params[2].gpr());
</ins><span class="cx"> jit.jump().linkTo(done, &jit);
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -7621,6 +7620,8 @@
</span><span class="cx"> patchpoint->appendSomeRegister(right);
</span><span class="cx"> patchpoint->append(m_tagMask, ValueRep::reg(GPRInfo::tagMaskRegister));
</span><span class="cx"> patchpoint->append(m_tagTypeNumber, ValueRep::reg(GPRInfo::tagTypeNumberRegister));
</span><ins>+ RefPtr<PatchpointExceptionHandle> exceptionHandle =
+ preparePatchpointForExceptions(patchpoint);
</ins><span class="cx"> patchpoint->numGPScratchRegisters = 1;
</span><span class="cx"> patchpoint->clobber(RegisterSet::macroScratchRegisters());
</span><span class="cx"> State* state = &m_ftlState;
</span><span class="lines">@@ -7628,6 +7629,9 @@
</span><span class="cx"> [=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
</span><span class="cx"> AllowMacroScratchRegisterUsage allowScratch(jit);
</span><span class="cx">
</span><ins>+ Box<CCallHelpers::JumpList> exceptions =
+ exceptionHandle->scheduleExitCreation(params)->jumps(jit);
+
</ins><span class="cx"> auto generator = Box<BinaryBitOpGenerator>::create(
</span><span class="cx"> leftOperand, rightOperand, JSValueRegs(params[0].gpr()),
</span><span class="cx"> JSValueRegs(params[1].gpr()), JSValueRegs(params[2].gpr()), params.gpScratch(0));
</span><span class="lines">@@ -7640,14 +7644,11 @@
</span><span class="cx"> [=] (CCallHelpers& jit) {
</span><span class="cx"> AllowMacroScratchRegisterUsage allowScratch(jit);
</span><span class="cx">
</span><del>- // FIXME: Make this do something.
- CCallHelpers::JumpList exceptions;
-
</del><span class="cx"> generator->slowPathJumpList().link(&jit);
</span><span class="cx"> callOperation(
</span><span class="cx"> *state, params.unavailableRegisters(), jit, node->origin.semantic,
</span><del>- &exceptions, slowPathFunction, params[0].gpr(), params[1].gpr(),
- params[2].gpr());
</del><ins>+ exceptions.get(), slowPathFunction, params[0].gpr(),
+ params[1].gpr(), params[2].gpr());
</ins><span class="cx"> jit.jump().linkTo(done, &jit);
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="lines">@@ -7673,6 +7674,8 @@
</span><span class="cx"> patchpoint->appendSomeRegister(right);
</span><span class="cx"> patchpoint->append(m_tagMask, ValueRep::reg(GPRInfo::tagMaskRegister));
</span><span class="cx"> patchpoint->append(m_tagTypeNumber, ValueRep::reg(GPRInfo::tagTypeNumberRegister));
</span><ins>+ RefPtr<PatchpointExceptionHandle> exceptionHandle =
+ preparePatchpointForExceptions(patchpoint);
</ins><span class="cx"> patchpoint->numGPScratchRegisters = 1;
</span><span class="cx"> patchpoint->numFPScratchRegisters = 1;
</span><span class="cx"> patchpoint->clobber(RegisterSet::macroScratchRegisters());
</span><span class="lines">@@ -7681,6 +7684,9 @@
</span><span class="cx"> [=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
</span><span class="cx"> AllowMacroScratchRegisterUsage allowScratch(jit);
</span><span class="cx">
</span><ins>+ Box<CCallHelpers::JumpList> exceptions =
+ exceptionHandle->scheduleExitCreation(params)->jumps(jit);
+
</ins><span class="cx"> auto generator = Box<JITRightShiftGenerator>::create(
</span><span class="cx"> leftOperand, rightOperand, JSValueRegs(params[0].gpr()),
</span><span class="cx"> JSValueRegs(params[1].gpr()), JSValueRegs(params[2].gpr()),
</span><span class="lines">@@ -7694,9 +7700,6 @@
</span><span class="cx"> [=] (CCallHelpers& jit) {
</span><span class="cx"> AllowMacroScratchRegisterUsage allowScratch(jit);
</span><span class="cx">
</span><del>- // FIXME: Make this do something.
- CCallHelpers::JumpList exceptions;
-
</del><span class="cx"> generator->slowPathJumpList().link(&jit);
</span><span class="cx">
</span><span class="cx"> J_JITOperation_EJJ slowPathFunction =
</span><span class="lines">@@ -7705,8 +7708,8 @@
</span><span class="cx">
</span><span class="cx"> callOperation(
</span><span class="cx"> *state, params.unavailableRegisters(), jit, node->origin.semantic,
</span><del>- &exceptions, slowPathFunction, params[0].gpr(), params[1].gpr(),
- params[2].gpr());
</del><ins>+ exceptions.get(), slowPathFunction, params[0].gpr(),
+ params[1].gpr(), params[2].gpr());
</ins><span class="cx"> jit.jump().linkTo(done, &jit);
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressftlshrexceptionjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/ftl-shr-exception.js (0 => 194746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/ftl-shr-exception.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/ftl-shr-exception.js 2016-01-08 01:10:15 UTC (rev 194746)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+function foo(a, b) {
+ try {
+ return a >> b;
+ } catch (e) {
+ return e;
+ }
+}
+
+noInline(foo);
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo((i & 1) ? 32 : "32", 2);
+ if (result !== 8)
+ throw "Error: bad result: " + result;
+}
+
+var result = foo({valueOf: function() { throw "error42"; }}, 2);
+if (result !== "error42")
+ throw "Error: bad result at end: " + result;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressftlsubexceptionjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/ftl-sub-exception.js (0 => 194746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/ftl-sub-exception.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/ftl-sub-exception.js 2016-01-08 01:10:15 UTC (rev 194746)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+function foo(a, b) {
+ try {
+ return a - b;
+ } catch (e) {
+ return e;
+ }
+}
+
+noInline(foo);
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo((i & 1) ? 32 : "32", 10);
+ if (result !== 22)
+ throw "Error: bad result: " + result;
+}
+
+var result = foo({valueOf: function() { throw "error42"; }}, 10);
+if (result !== "error42")
+ throw "Error: bad result at end: " + result;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressftlxorexceptionjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/ftl-xor-exception.js (0 => 194746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/ftl-xor-exception.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/ftl-xor-exception.js 2016-01-08 01:10:15 UTC (rev 194746)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+function foo(a, b) {
+ try {
+ return a ^ b;
+ } catch (e) {
+ return e;
+ }
+}
+
+noInline(foo);
+
+for (var i = 0; i < 100000; ++i) {
+ var result = foo((i & 1) ? 32 : "32", 10);
+ if (result !== 42)
+ throw "Error: bad result: " + result;
+}
+
+var result = foo({valueOf: function() { throw "error42"; }}, 10);
+if (result !== "error42")
+ throw "Error: bad result at end: " + result;
</ins></span></pre>
</div>
</div>
</body>
</html>