<!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>[206411] 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/206411">206411</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-26 20:45:25 -0700 (Mon, 26 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make DFGSlowPathGenerator a bit more variadic
https://bugs.webkit.org/show_bug.cgi?id=162378
Patch by Sam Weinig <sam@webkit.org> on 2016-09-26
Reviewed by Filip Pizlo.
Make the subclass of CallSlowPathGenerator that takes arguments variadic
so it can take any number of arguments. Also updates the slowPathCall helper
function to be variadic. I had to move the spill mode and exception check
requirement parameters to before the arguments since the variadic arguments
must be at the end. As a convenience, I added an overload of slowPathCall that
doesn't take spill mode and exception check requirement parameters.
* dfg/DFGSlowPathGenerator.h:
(JSC::DFG::CallResultAndArgumentsSlowPathGenerator::CallResultAndArgumentsSlowPathGenerator):
(JSC::DFG::CallResultAndArgumentsSlowPathGenerator::unpackAndGenerate):
(JSC::DFG::slowPathCall):
(JSC::DFG::CallResultAndNoArgumentsSlowPathGenerator::CallResultAndNoArgumentsSlowPathGenerator): Deleted.
(JSC::DFG::CallResultAndOneArgumentSlowPathGenerator::CallResultAndOneArgumentSlowPathGenerator): Deleted.
(JSC::DFG::CallResultAndTwoArgumentsSlowPathGenerator::CallResultAndTwoArgumentsSlowPathGenerator): Deleted.
(JSC::DFG::CallResultAndThreeArgumentsSlowPathGenerator::CallResultAndThreeArgumentsSlowPathGenerator): Deleted.
(JSC::DFG::CallResultAndFourArgumentsSlowPathGenerator::CallResultAndFourArgumentsSlowPathGenerator): Deleted.
(JSC::DFG::CallResultAndFourArgumentsSlowPathGenerator::generateInternal): Deleted.
(JSC::DFG::CallResultAndFiveArgumentsSlowPathGenerator::CallResultAndFiveArgumentsSlowPathGenerator): Deleted.
(JSC::DFG::CallResultAndFiveArgumentsSlowPathGenerator::generateInternal): Deleted.
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileValueToInt32):
(JSC::DFG::SpeculativeJIT::compileNotifyWrite):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::cachedGetById):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSlowPathGeneratorh">trunk/Source/JavaScriptCore/dfg/DFGSlowPathGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (206410 => 206411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-09-27 03:35:01 UTC (rev 206410)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-09-27 03:45:25 UTC (rev 206411)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-09-26 Sam Weinig <sam@webkit.org>
+
+ Make DFGSlowPathGenerator a bit more variadic
+ https://bugs.webkit.org/show_bug.cgi?id=162378
+
+ Reviewed by Filip Pizlo.
+
+ Make the subclass of CallSlowPathGenerator that takes arguments variadic
+ so it can take any number of arguments. Also updates the slowPathCall helper
+ function to be variadic. I had to move the spill mode and exception check
+ requirement parameters to before the arguments since the variadic arguments
+ must be at the end. As a convenience, I added an overload of slowPathCall that
+ doesn't take spill mode and exception check requirement parameters.
+
+ * dfg/DFGSlowPathGenerator.h:
+ (JSC::DFG::CallResultAndArgumentsSlowPathGenerator::CallResultAndArgumentsSlowPathGenerator):
+ (JSC::DFG::CallResultAndArgumentsSlowPathGenerator::unpackAndGenerate):
+ (JSC::DFG::slowPathCall):
+ (JSC::DFG::CallResultAndNoArgumentsSlowPathGenerator::CallResultAndNoArgumentsSlowPathGenerator): Deleted.
+ (JSC::DFG::CallResultAndOneArgumentSlowPathGenerator::CallResultAndOneArgumentSlowPathGenerator): Deleted.
+ (JSC::DFG::CallResultAndTwoArgumentsSlowPathGenerator::CallResultAndTwoArgumentsSlowPathGenerator): Deleted.
+ (JSC::DFG::CallResultAndThreeArgumentsSlowPathGenerator::CallResultAndThreeArgumentsSlowPathGenerator): Deleted.
+ (JSC::DFG::CallResultAndFourArgumentsSlowPathGenerator::CallResultAndFourArgumentsSlowPathGenerator): Deleted.
+ (JSC::DFG::CallResultAndFourArgumentsSlowPathGenerator::generateInternal): Deleted.
+ (JSC::DFG::CallResultAndFiveArgumentsSlowPathGenerator::CallResultAndFiveArgumentsSlowPathGenerator): Deleted.
+ (JSC::DFG::CallResultAndFiveArgumentsSlowPathGenerator::generateInternal): Deleted.
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileValueToInt32):
+ (JSC::DFG::SpeculativeJIT::compileNotifyWrite):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::cachedGetById):
+
</ins><span class="cx"> 2016-09-26 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r206405.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSlowPathGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSlowPathGenerator.h (206410 => 206411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSlowPathGenerator.h 2016-09-27 03:35:01 UTC (rev 206410)
+++ trunk/Source/JavaScriptCore/dfg/DFGSlowPathGenerator.h 2016-09-27 03:45:25 UTC (rev 206411)
</span><span class="lines">@@ -159,267 +159,55 @@
</span><span class="cx"> Vector<SilentRegisterSavePlan, 2> m_plans;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<typename JumpType, typename FunctionType, typename ResultType>
-class CallResultAndNoArgumentsSlowPathGenerator
</del><ins>+template<typename JumpType, typename FunctionType, typename ResultType, typename... Arguments>
+class CallResultAndArgumentsSlowPathGenerator
</ins><span class="cx"> : public CallSlowPathGenerator<JumpType, FunctionType, ResultType> {
</span><span class="cx"> public:
</span><del>- CallResultAndNoArgumentsSlowPathGenerator(
</del><ins>+ CallResultAndArgumentsSlowPathGenerator(
</ins><span class="cx"> JumpType from, SpeculativeJIT* jit, FunctionType function,
</span><del>- SpillRegistersMode spillMode, ExceptionCheckRequirement requirement, ResultType result)
</del><ins>+ SpillRegistersMode spillMode, ExceptionCheckRequirement requirement, ResultType result, Arguments... arguments)
</ins><span class="cx"> : CallSlowPathGenerator<JumpType, FunctionType, ResultType>(
</span><span class="cx"> from, jit, function, spillMode, requirement, result)
</span><ins>+ , m_arguments(std::forward<Arguments>(arguments)...)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><del>-
-protected:
- void generateInternal(SpeculativeJIT* jit) override
- {
- this->setUp(jit);
- this->recordCall(jit->callOperation(this->m_function, extractResult(this->m_result)));
- this->tearDown(jit);
- }
-};
</del><span class="cx">
</span><del>-template<
- typename JumpType, typename FunctionType, typename ResultType,
- typename ArgumentType1>
-class CallResultAndOneArgumentSlowPathGenerator
- : public CallSlowPathGenerator<JumpType, FunctionType, ResultType> {
-public:
- CallResultAndOneArgumentSlowPathGenerator(
- JumpType from, SpeculativeJIT* jit, FunctionType function,
- SpillRegistersMode spillMode, ExceptionCheckRequirement requirement, ResultType result, ArgumentType1 argument1)
- : CallSlowPathGenerator<JumpType, FunctionType, ResultType>(
- from, jit, function, spillMode, requirement, result)
- , m_argument1(argument1)
- {
- }
-
</del><span class="cx"> protected:
</span><del>- void generateInternal(SpeculativeJIT* jit) override
</del><ins>+ template<size_t... ArgumentsIndex>
+ void unpackAndGenerate(SpeculativeJIT* jit, std::index_sequence<ArgumentsIndex...>)
</ins><span class="cx"> {
</span><span class="cx"> this->setUp(jit);
</span><del>- this->recordCall(jit->callOperation(this->m_function, extractResult(this->m_result), m_argument1));
</del><ins>+ this->recordCall(jit->callOperation(this->m_function, extractResult(this->m_result), std::get<ArgumentsIndex>(m_arguments)...));
</ins><span class="cx"> this->tearDown(jit);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ArgumentType1 m_argument1;
-};
-
-template<
- typename JumpType, typename FunctionType, typename ResultType,
- typename ArgumentType1, typename ArgumentType2>
-class CallResultAndTwoArgumentsSlowPathGenerator
- : public CallSlowPathGenerator<JumpType, FunctionType, ResultType> {
-public:
- CallResultAndTwoArgumentsSlowPathGenerator(
- JumpType from, SpeculativeJIT* jit, FunctionType function,
- SpillRegistersMode spillMode, ExceptionCheckRequirement requirement, ResultType result, ArgumentType1 argument1,
- ArgumentType2 argument2)
- : CallSlowPathGenerator<JumpType, FunctionType, ResultType>(
- from, jit, function, spillMode, requirement, result)
- , m_argument1(argument1)
- , m_argument2(argument2)
- {
- }
-
-protected:
</del><span class="cx"> void generateInternal(SpeculativeJIT* jit) override
</span><span class="cx"> {
</span><del>- this->setUp(jit);
- this->recordCall(jit->callOperation(this->m_function, extractResult(this->m_result), m_argument1, m_argument2));
- this->tearDown(jit);
</del><ins>+ unpackAndGenerate(jit, std::make_index_sequence<std::tuple_size<std::tuple<Arguments...>>::value>());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- ArgumentType1 m_argument1;
- ArgumentType2 m_argument2;
</del><ins>+ std::tuple<Arguments...> m_arguments;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-template<
- typename JumpType, typename FunctionType, typename ResultType,
- typename ArgumentType1, typename ArgumentType2, typename ArgumentType3>
-class CallResultAndThreeArgumentsSlowPathGenerator
- : public CallSlowPathGenerator<JumpType, FunctionType, ResultType> {
-public:
- CallResultAndThreeArgumentsSlowPathGenerator(
- JumpType from, SpeculativeJIT* jit, FunctionType function,
- SpillRegistersMode spillMode, ExceptionCheckRequirement requirement, ResultType result, ArgumentType1 argument1,
- ArgumentType2 argument2, ArgumentType3 argument3)
- : CallSlowPathGenerator<JumpType, FunctionType, ResultType>(
- from, jit, function, spillMode, requirement, result)
- , m_argument1(argument1)
- , m_argument2(argument2)
- , m_argument3(argument3)
- {
- }
-
-protected:
- void generateInternal(SpeculativeJIT* jit) override
- {
- this->setUp(jit);
- this->recordCall(
- jit->callOperation(
- this->m_function, extractResult(this->m_result), m_argument1, m_argument2,
- m_argument3));
- this->tearDown(jit);
- }
-
- ArgumentType1 m_argument1;
- ArgumentType2 m_argument2;
- ArgumentType3 m_argument3;
-};
-
-template<
- typename JumpType, typename FunctionType, typename ResultType,
- typename ArgumentType1, typename ArgumentType2, typename ArgumentType3,
- typename ArgumentType4>
-class CallResultAndFourArgumentsSlowPathGenerator
- : public CallSlowPathGenerator<JumpType, FunctionType, ResultType> {
-public:
- CallResultAndFourArgumentsSlowPathGenerator(
- JumpType from, SpeculativeJIT* jit, FunctionType function,
- SpillRegistersMode spillMode, ExceptionCheckRequirement requirement, ResultType result, ArgumentType1 argument1,
- ArgumentType2 argument2, ArgumentType3 argument3, ArgumentType4 argument4)
- : CallSlowPathGenerator<JumpType, FunctionType, ResultType>(
- from, jit, function, spillMode, requirement, result)
- , m_argument1(argument1)
- , m_argument2(argument2)
- , m_argument3(argument3)
- , m_argument4(argument4)
- {
- }
-
-protected:
- void generateInternal(SpeculativeJIT* jit)
- {
- this->setUp(jit);
- this->recordCall(
- jit->callOperation(
- this->m_function, extractResult(this->m_result), m_argument1, m_argument2,
- m_argument3, m_argument4));
- this->tearDown(jit);
- }
-
- ArgumentType1 m_argument1;
- ArgumentType2 m_argument2;
- ArgumentType3 m_argument3;
- ArgumentType4 m_argument4;
-};
-
-template<
- typename JumpType, typename FunctionType, typename ResultType,
- typename ArgumentType1, typename ArgumentType2, typename ArgumentType3,
- typename ArgumentType4, typename ArgumentType5>
-class CallResultAndFiveArgumentsSlowPathGenerator
- : public CallSlowPathGenerator<JumpType, FunctionType, ResultType> {
-public:
- CallResultAndFiveArgumentsSlowPathGenerator(
- JumpType from, SpeculativeJIT* jit, FunctionType function,
- SpillRegistersMode spillMode, ExceptionCheckRequirement requirement, ResultType result, ArgumentType1 argument1,
- ArgumentType2 argument2, ArgumentType3 argument3, ArgumentType4 argument4,
- ArgumentType5 argument5)
- : CallSlowPathGenerator<JumpType, FunctionType, ResultType>(
- from, jit, function, spillMode, requirement, result)
- , m_argument1(argument1)
- , m_argument2(argument2)
- , m_argument3(argument3)
- , m_argument4(argument4)
- , m_argument5(argument5)
- {
- }
-
-protected:
- void generateInternal(SpeculativeJIT* jit)
- {
- this->setUp(jit);
- this->recordCall(
- jit->callOperation(
- this->m_function, extractResult(this->m_result), m_argument1, m_argument2,
- m_argument3, m_argument4, m_argument5));
- this->tearDown(jit);
- }
-
- ArgumentType1 m_argument1;
- ArgumentType2 m_argument2;
- ArgumentType3 m_argument3;
- ArgumentType4 m_argument4;
- ArgumentType5 m_argument5;
-};
-
-template<typename JumpType, typename FunctionType, typename ResultType>
</del><ins>+template<typename JumpType, typename FunctionType, typename ResultType, typename... Arguments>
</ins><span class="cx"> inline std::unique_ptr<SlowPathGenerator> slowPathCall(
</span><span class="cx"> JumpType from, SpeculativeJIT* jit, FunctionType function,
</span><del>- ResultType result, SpillRegistersMode spillMode = NeedToSpill, ExceptionCheckRequirement requirement = ExceptionCheckRequirement::CheckNeeded)
</del><ins>+ SpillRegistersMode spillMode, ExceptionCheckRequirement requirement,
+ ResultType result, Arguments... arguments)
</ins><span class="cx"> {
</span><del>- return std::make_unique<CallResultAndNoArgumentsSlowPathGenerator<JumpType, FunctionType, ResultType>>(
- from, jit, function, spillMode, requirement, result);
</del><ins>+ return std::make_unique<CallResultAndArgumentsSlowPathGenerator<JumpType, FunctionType, ResultType, Arguments...>>(
+ from, jit, function, spillMode, requirement, result, arguments...);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<
- typename JumpType, typename FunctionType, typename ResultType,
- typename ArgumentType1>
</del><ins>+template<typename JumpType, typename FunctionType, typename ResultType, typename... Arguments>
</ins><span class="cx"> inline std::unique_ptr<SlowPathGenerator> slowPathCall(
</span><span class="cx"> JumpType from, SpeculativeJIT* jit, FunctionType function,
</span><del>- ResultType result, ArgumentType1 argument1,
- SpillRegistersMode spillMode = NeedToSpill, ExceptionCheckRequirement requirement = ExceptionCheckRequirement::CheckNeeded)
</del><ins>+ ResultType result, Arguments... arguments)
</ins><span class="cx"> {
</span><del>- return std::make_unique<CallResultAndOneArgumentSlowPathGenerator<JumpType, FunctionType, ResultType, ArgumentType1>>(
- from, jit, function, spillMode, requirement, result, argument1);
</del><ins>+ return slowPathCall(
+ from, jit, function, NeedToSpill, ExceptionCheckRequirement::CheckNeeded, result, arguments...);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<
- typename JumpType, typename FunctionType, typename ResultType,
- typename ArgumentType1, typename ArgumentType2>
-inline std::unique_ptr<SlowPathGenerator> slowPathCall(
- JumpType from, SpeculativeJIT* jit, FunctionType function,
- ResultType result, ArgumentType1 argument1, ArgumentType2 argument2,
- SpillRegistersMode spillMode = NeedToSpill, ExceptionCheckRequirement requirement = ExceptionCheckRequirement::CheckNeeded)
-{
- return std::make_unique<CallResultAndTwoArgumentsSlowPathGenerator<JumpType, FunctionType, ResultType, ArgumentType1, ArgumentType2>>(
- from, jit, function, spillMode, requirement, result, argument1, argument2);
-}
-
-template<
- typename JumpType, typename FunctionType, typename ResultType,
- typename ArgumentType1, typename ArgumentType2, typename ArgumentType3>
-inline std::unique_ptr<SlowPathGenerator> slowPathCall(
- JumpType from, SpeculativeJIT* jit, FunctionType function,
- ResultType result, ArgumentType1 argument1, ArgumentType2 argument2,
- ArgumentType3 argument3, SpillRegistersMode spillMode = NeedToSpill, ExceptionCheckRequirement requirement = ExceptionCheckRequirement::CheckNeeded)
-{
- return std::make_unique<CallResultAndThreeArgumentsSlowPathGenerator<JumpType, FunctionType, ResultType, ArgumentType1, ArgumentType2,
- ArgumentType3>>(from, jit, function, spillMode, requirement, result, argument1, argument2, argument3);
-}
-
-template<
- typename JumpType, typename FunctionType, typename ResultType,
- typename ArgumentType1, typename ArgumentType2, typename ArgumentType3,
- typename ArgumentType4>
-inline std::unique_ptr<SlowPathGenerator> slowPathCall(
- JumpType from, SpeculativeJIT* jit, FunctionType function,
- ResultType result, ArgumentType1 argument1, ArgumentType2 argument2,
- ArgumentType3 argument3, ArgumentType4 argument4,
- SpillRegistersMode spillMode = NeedToSpill, ExceptionCheckRequirement requirement = ExceptionCheckRequirement::CheckNeeded)
-{
- return std::make_unique<CallResultAndFourArgumentsSlowPathGenerator<JumpType, FunctionType, ResultType, ArgumentType1, ArgumentType2,
- ArgumentType3, ArgumentType4>>(from, jit, function, spillMode, requirement, result, argument1, argument2, argument3, argument4);
-}
-
-template<
- typename JumpType, typename FunctionType, typename ResultType,
- typename ArgumentType1, typename ArgumentType2, typename ArgumentType3,
- typename ArgumentType4, typename ArgumentType5>
-inline std::unique_ptr<SlowPathGenerator> slowPathCall(
- JumpType from, SpeculativeJIT* jit, FunctionType function,
- ResultType result, ArgumentType1 argument1, ArgumentType2 argument2,
- ArgumentType3 argument3, ArgumentType4 argument4, ArgumentType5 argument5,
- SpillRegistersMode spillMode = NeedToSpill, ExceptionCheckRequirement requirement = ExceptionCheckRequirement::CheckNeeded)
-{
- return std::make_unique<CallResultAndFiveArgumentsSlowPathGenerator<JumpType, FunctionType, ResultType, ArgumentType1, ArgumentType2,
- ArgumentType3, ArgumentType4, ArgumentType5>>(from, jit, function, spillMode, requirement, result, argument1, argument2, argument3,
- argument4, argument5);
-}
-
</del><span class="cx"> template<typename JumpType, typename DestinationType, typename SourceType, unsigned numberOfAssignments>
</span><span class="cx"> class AssigningSlowPathGenerator : public JumpingSlowPathGenerator<JumpType> {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (206410 => 206411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2016-09-27 03:35:01 UTC (rev 206410)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2016-09-27 03:45:25 UTC (rev 206411)
</span><span class="lines">@@ -2151,7 +2151,7 @@
</span><span class="cx"> GPRReg gpr = result.gpr();
</span><span class="cx"> JITCompiler::Jump notTruncatedToInteger = m_jit.branchTruncateDoubleToInt32(fpr, gpr, JITCompiler::BranchIfTruncateFailed);
</span><span class="cx">
</span><del>- addSlowPathGenerator(slowPathCall(notTruncatedToInteger, this, operationToInt32, gpr, fpr, NeedToSpill, ExceptionCheckRequirement::CheckNotNeeded));
</del><ins>+ addSlowPathGenerator(slowPathCall(notTruncatedToInteger, this, operationToInt32, NeedToSpill, ExceptionCheckRequirement::CheckNotNeeded, gpr, fpr));
</ins><span class="cx">
</span><span class="cx"> int32Result(gpr, node);
</span><span class="cx"> return;
</span><span class="lines">@@ -6751,7 +6751,7 @@
</span><span class="cx"> TrustedImm32(IsInvalidated));
</span><span class="cx">
</span><span class="cx"> addSlowPathGenerator(
</span><del>- slowPathCall(slowCase, this, operationNotifyWrite, NoResult, set, NeedToSpill, ExceptionCheckRequirement::CheckNotNeeded));
</del><ins>+ slowPathCall(slowCase, this, operationNotifyWrite, NeedToSpill, ExceptionCheckRequirement::CheckNotNeeded, NoResult, set));
</ins><span class="cx">
</span><span class="cx"> noResult(node);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (206410 => 206411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2016-09-27 03:35:01 UTC (rev 206410)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2016-09-27 03:45:25 UTC (rev 206411)
</span><span class="lines">@@ -180,8 +180,9 @@
</span><span class="cx"> slowCases.append(gen.slowPathJump());
</span><span class="cx">
</span><span class="cx"> auto slowPath = slowPathCall(
</span><del>- slowCases, this, type == AccessType::Get ? operationGetByIdOptimize : operationTryGetByIdOptimize, resultGPR, gen.stubInfo(), baseGPR,
- identifierUID(identifierNumber), spillMode);
</del><ins>+ slowCases, this, type == AccessType::Get ? operationGetByIdOptimize : operationTryGetByIdOptimize,
+ spillMode, ExceptionCheckRequirement::CheckNeeded,
+ resultGPR, gen.stubInfo(), baseGPR, identifierUID(identifierNumber));
</ins><span class="cx">
</span><span class="cx"> m_jit.addGetById(gen, slowPath.get());
</span><span class="cx"> addSlowPathGenerator(WTFMove(slowPath));
</span></span></pre>
</div>
</div>
</body>
</html>