<!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>[194141] trunk</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/194141">194141</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-16 04:47:55 -0800 (Wed, 16 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/194135">r194135</a>.
https://bugs.webkit.org/show_bug.cgi?id=152333
due to missing OSR exit materialization support in FTL
(Requested by yusukesuzuki on #webkit).
Reverted changeset:
"[ES6] Handle new_generator_func / new_generator_func_exp in
DFG / FTL"
https://bugs.webkit.org/show_bug.cgi?id=152227
http://trac.webkit.org/changeset/194135</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsgeneratorfunctioncreatejs">trunk/LayoutTests/js/regress/script-tests/generator-function-create.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCapabilitiescpp">trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGClobberizeh">trunk/Source/JavaScriptCore/dfg/DFGClobberize.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGClobbersExitStatecpp">trunk/Source/JavaScriptCore/dfg/DFGClobbersExitState.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGDoesGCcpp">trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFixupPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGMayExitcpp">trunk/Source/JavaScriptCore/dfg/DFGMayExit.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeh">trunk/Source/JavaScriptCore/dfg/DFGNode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeTypeh">trunk/Source/JavaScriptCore/dfg/DFGNodeType.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGObjectAllocationSinkingPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPredictionPropagationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSafeToExecuteh">trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGStoreBarrierInsertionPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGStoreBarrierInsertionPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGStructureRegistrationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCapabilitiescpp">trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressgeneratorfunctioncreateoptimizedjs">trunk/Source/JavaScriptCore/tests/stress/generator-function-create-optimized.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressgeneratorfunctiondeclarationsinkingnodoubleallocatejs">trunk/Source/JavaScriptCore/tests/stress/generator-function-declaration-sinking-no-double-allocate.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressgeneratorfunctiondeclarationsinkingosrexitjs">trunk/Source/JavaScriptCore/tests/stress/generator-function-declaration-sinking-osrexit.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressgeneratorfunctiondeclarationsinkingputjs">trunk/Source/JavaScriptCore/tests/stress/generator-function-declaration-sinking-put.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressgeneratorfunctionexpressionsinkingnodoubleallocatejs">trunk/Source/JavaScriptCore/tests/stress/generator-function-expression-sinking-no-double-allocate.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressgeneratorfunctionexpressionsinkingosrexitjs">trunk/Source/JavaScriptCore/tests/stress/generator-function-expression-sinking-osrexit.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressgeneratorfunctionexpressionsinkingputjs">trunk/Source/JavaScriptCore/tests/stress/generator-function-expression-sinking-put.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/LayoutTests/ChangeLog 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-12-16 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r194135.
+ https://bugs.webkit.org/show_bug.cgi?id=152333
+
+ due to missing OSR exit materialization support in FTL
+ (Requested by yusukesuzuki on #webkit).
+
+ Reverted changeset:
+
+ "[ES6] Handle new_generator_func / new_generator_func_exp in
+ DFG / FTL"
+ https://bugs.webkit.org/show_bug.cgi?id=152227
+ http://trac.webkit.org/changeset/194135
+
</ins><span class="cx"> 2015-12-16 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Align WebKit testharness.js with WPT testharness.js
</span></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsgeneratorfunctioncreatejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/regress/script-tests/generator-function-create.js (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/generator-function-create.js 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/LayoutTests/js/regress/script-tests/generator-function-create.js 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -7,12 +7,6 @@
</span><span class="cx"> }
</span><span class="cx"> return gen;
</span><span class="cx"> }
</span><del>-function test()
-{
- for (var i = 0; i < 500; ++i)
- createGeneratorFunction();
-}
-noInline(test);
-
</del><ins>+noInline(createGeneratorFunction);
</ins><span class="cx"> for (var i = 0; i < 1e4; ++i)
</span><del>- test();
</del><ins>+ createGeneratorFunction();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-12-16 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r194135.
+ https://bugs.webkit.org/show_bug.cgi?id=152333
+
+ due to missing OSR exit materialization support in FTL
+ (Requested by yusukesuzuki on #webkit).
+
+ Reverted changeset:
+
+ "[ES6] Handle new_generator_func / new_generator_func_exp in
+ DFG / FTL"
+ https://bugs.webkit.org/show_bug.cgi?id=152227
+ http://trac.webkit.org/changeset/194135
+
</ins><span class="cx"> 2015-12-16 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Add fetch API compile time flag
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -1760,12 +1760,7 @@
</span><span class="cx"> forNode(node).set(
</span><span class="cx"> m_graph, m_codeBlock->globalObjectFor(node->origin.semantic)->arrowFunctionStructure());
</span><span class="cx"> break;
</span><del>-
- case NewGeneratorFunction:
- forNode(node).set(
- m_graph, m_codeBlock->globalObjectFor(node->origin.semantic)->generatorFunctionStructure());
- break;
-
</del><ins>+
</ins><span class="cx"> case NewFunction:
</span><span class="cx"> forNode(node).set(
</span><span class="cx"> m_graph, m_codeBlock->globalObjectFor(node->origin.semantic)->functionStructure());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -4557,27 +4557,23 @@
</span><span class="cx"> NEXT_OPCODE(op_put_to_arguments);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case op_new_func:
- case op_new_generator_func: {
</del><ins>+ case op_new_func: {
</ins><span class="cx"> FunctionExecutable* decl = m_inlineStackTop->m_profiledBlock->functionDecl(currentInstruction[3].u.operand);
</span><span class="cx"> FrozenValue* frozen = m_graph.freezeStrong(decl);
</span><del>- NodeType op = (opcodeID == op_new_generator_func) ? NewGeneratorFunction : NewFunction;
- set(VirtualRegister(currentInstruction[1].u.operand), addToGraph(op, OpInfo(frozen), get(VirtualRegister(currentInstruction[2].u.operand))));
- static_assert(OPCODE_LENGTH(op_new_func) == OPCODE_LENGTH(op_new_generator_func), "The length of op_new_func should eqaual to one of op_new_generator_func");
</del><ins>+ set(VirtualRegister(currentInstruction[1].u.operand),
+ addToGraph(NewFunction, OpInfo(frozen), get(VirtualRegister(currentInstruction[2].u.operand))));
</ins><span class="cx"> NEXT_OPCODE(op_new_func);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case op_new_func_exp:
</span><del>- case op_new_generator_func_exp:
</del><span class="cx"> case op_new_arrow_func_exp: {
</span><span class="cx"> FunctionExecutable* expr = m_inlineStackTop->m_profiledBlock->functionExpr(currentInstruction[3].u.operand);
</span><span class="cx"> FrozenValue* frozen = m_graph.freezeStrong(expr);
</span><del>- NodeType op = (opcodeID == op_new_generator_func_exp) ? NewGeneratorFunction : NewFunction;
- set(VirtualRegister(currentInstruction[1].u.operand), addToGraph(op, OpInfo(frozen), get(VirtualRegister(currentInstruction[2].u.operand))));
</del><ins>+ set(VirtualRegister(currentInstruction[1].u.operand),
+ addToGraph(NewFunction, OpInfo(frozen), get(VirtualRegister(currentInstruction[2].u.operand))));
</ins><span class="cx">
</span><del>- if (opcodeID == op_new_func_exp || opcodeID == op_new_generator_func_exp) {
</del><ins>+ if (opcodeID == op_new_func_exp) {
</ins><span class="cx"> // Curly braces are necessary
</span><del>- static_assert(OPCODE_LENGTH(op_new_func_exp) == OPCODE_LENGTH(op_new_generator_func_exp), "The length of op_new_func_exp should eqaual to one of op_new_generator_func_exp");
</del><span class="cx"> NEXT_OPCODE(op_new_func_exp);
</span><span class="cx"> } else {
</span><span class="cx"> // Curly braces are necessary
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -215,8 +215,6 @@
</span><span class="cx"> case op_to_index_string:
</span><span class="cx"> case op_new_func:
</span><span class="cx"> case op_new_func_exp:
</span><del>- case op_new_generator_func:
- case op_new_generator_func_exp:
</del><span class="cx"> case op_new_arrow_func_exp:
</span><span class="cx"> case op_create_lexical_environment:
</span><span class="cx"> case op_get_parent_scope:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGClobberizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGClobberize.h (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -1033,7 +1033,6 @@
</span><span class="cx">
</span><span class="cx"> case NewArrowFunction:
</span><span class="cx"> case NewFunction:
</span><del>- case NewGeneratorFunction:
</del><span class="cx"> if (node->castOperand<FunctionExecutable*>()->singletonFunction()->isStillValid())
</span><span class="cx"> write(Watchpoint_fire);
</span><span class="cx"> read(HeapObjectCount);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGClobbersExitStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGClobbersExitState.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGClobbersExitState.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGClobbersExitState.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -77,7 +77,6 @@
</span><span class="cx">
</span><span class="cx"> case NewArrowFunction:
</span><span class="cx"> case NewFunction:
</span><del>- case NewGeneratorFunction:
</del><span class="cx"> // Like above, but with the JSFunction allocation caveat.
</span><span class="cx"> return node->castOperand<FunctionExecutable*>()->singletonFunction()->isStillValid();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDoesGCcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -247,7 +247,6 @@
</span><span class="cx"> case MakeRope:
</span><span class="cx"> case NewArrowFunction:
</span><span class="cx"> case NewFunction:
</span><del>- case NewGeneratorFunction:
</del><span class="cx"> case NewTypedArray:
</span><span class="cx"> case ThrowReferenceError:
</span><span class="cx"> case GetPropertyEnumerator:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -1387,8 +1387,7 @@
</span><span class="cx">
</span><span class="cx"> case CreateScopedArguments:
</span><span class="cx"> case CreateActivation:
</span><del>- case NewFunction:
- case NewGeneratorFunction: {
</del><ins>+ case NewFunction: {
</ins><span class="cx"> fixEdge<CellUse>(node->child1());
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGMayExitcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGMayExit.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGMayExit.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGMayExit.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -143,7 +143,6 @@
</span><span class="cx"> case MaterializeNewObject:
</span><span class="cx"> case NewFunction:
</span><span class="cx"> case NewArrowFunction:
</span><del>- case NewGeneratorFunction:
</del><span class="cx"> case NewStringObject:
</span><span class="cx"> case CreateActivation:
</span><span class="cx"> result = ExitsForExceptions;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNode.h (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNode.h 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGNode.h 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -585,7 +585,7 @@
</span><span class="cx">
</span><span class="cx"> void convertToPhantomNewFunction()
</span><span class="cx"> {
</span><del>- ASSERT(m_op == NewFunction || m_op == NewArrowFunction || m_op == NewGeneratorFunction);
</del><ins>+ ASSERT(m_op == NewFunction || m_op == NewArrowFunction);
</ins><span class="cx"> m_op = PhantomNewFunction;
</span><span class="cx"> m_flags |= NodeMustGenerate;
</span><span class="cx"> m_opInfo = 0;
</span><span class="lines">@@ -1356,7 +1356,6 @@
</span><span class="cx"> case CheckCell:
</span><span class="cx"> case NewFunction:
</span><span class="cx"> case NewArrowFunction:
</span><del>- case NewGeneratorFunction:
</del><span class="cx"> case CreateActivation:
</span><span class="cx"> case MaterializeCreateActivation:
</span><span class="cx"> return true;
</span><span class="lines">@@ -1575,7 +1574,6 @@
</span><span class="cx"> switch (op()) {
</span><span class="cx"> case NewArrowFunction:
</span><span class="cx"> case NewFunction:
</span><del>- case NewGeneratorFunction:
</del><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNodeType.h (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNodeType.h 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGNodeType.h 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -312,7 +312,6 @@
</span><span class="cx"> macro(NewFunction, NodeResultJS) \
</span><span class="cx"> \
</span><span class="cx"> macro(NewArrowFunction, NodeResultJS) \
</span><del>- macro(NewGeneratorFunction, NodeResultJS) \
</del><span class="cx"> \
</span><span class="cx"> /* These aren't terminals but always exit */ \
</span><span class="cx"> macro(Throw, NodeMustGenerate) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGObjectAllocationSinkingPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> // once it is escaped if it still has pointers to it in order to
</span><span class="cx"> // replace any use of those pointers by the corresponding
</span><span class="cx"> // materialization
</span><del>- enum class Kind { Escaped, Object, Activation, Function, ArrowFunction, GeneratorFunction };
</del><ins>+ enum class Kind { Escaped, Object, Activation, Function, NewArrowFunction };
</ins><span class="cx">
</span><span class="cx"> explicit Allocation(Node* identifier = nullptr, Kind kind = Kind::Escaped)
</span><span class="cx"> : m_identifier(identifier)
</span><span class="lines">@@ -233,8 +233,13 @@
</span><span class="cx">
</span><span class="cx"> bool isFunctionAllocation() const
</span><span class="cx"> {
</span><del>- return m_kind == Kind::Function || m_kind == Kind::ArrowFunction || m_kind == Kind::GeneratorFunction;
</del><ins>+ return m_kind == Kind::Function || m_kind == Kind::NewArrowFunction;
</ins><span class="cx"> }
</span><ins>+
+ bool isArrowFunctionAllocation() const
+ {
+ return m_kind == Kind::NewArrowFunction;
+ }
</ins><span class="cx">
</span><span class="cx"> bool operator==(const Allocation& other) const
</span><span class="cx"> {
</span><span class="lines">@@ -269,14 +274,10 @@
</span><span class="cx"> out.print("Function");
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case Kind::ArrowFunction:
- out.print("ArrowFunction");
</del><ins>+ case Kind::NewArrowFunction:
+ out.print("NewArrowFunction");
</ins><span class="cx"> break;
</span><span class="cx">
</span><del>- case Kind::GeneratorFunction:
- out.print("GeneratorFunction");
- break;
-
</del><span class="cx"> case Kind::Activation:
</span><span class="cx"> out.print("Activation");
</span><span class="cx"> break;
</span><span class="lines">@@ -836,19 +837,13 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case NewFunction:
</span><del>- case NewArrowFunction:
- case NewGeneratorFunction: {
</del><ins>+ case NewArrowFunction: {
</ins><span class="cx"> if (node->castOperand<FunctionExecutable*>()->singletonFunction()->isStillValid()) {
</span><span class="cx"> m_heap.escape(node->child1().node());
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (node->op() == NewGeneratorFunction)
- target = &m_heap.newAllocation(node, Allocation::Kind::GeneratorFunction);
- else if (node->op() == NewArrowFunction)
- target = &m_heap.newAllocation(node, Allocation::Kind::ArrowFunction);
- else
- target = &m_heap.newAllocation(node, Allocation::Kind::Function);
</del><ins>+ target = &m_heap.newAllocation(node, Allocation::Kind::Function);
</ins><span class="cx"> writes.add(FunctionExecutablePLoc, LazyNode(node->cellOperand()));
</span><span class="cx"> writes.add(FunctionActivationPLoc, LazyNode(node->child1().node()));
</span><span class="cx"> break;
</span><span class="lines">@@ -1451,14 +1446,11 @@
</span><span class="cx"> OpInfo(set), OpInfo(data), 0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case Allocation::Kind::ArrowFunction:
- case Allocation::Kind::GeneratorFunction:
</del><ins>+ case Allocation::Kind::NewArrowFunction:
</ins><span class="cx"> case Allocation::Kind::Function: {
</span><span class="cx"> FrozenValue* executable = allocation.identifier()->cellOperand();
</span><span class="cx">
</span><del>- NodeType nodeType =
- allocation.kind() == Allocation::Kind::ArrowFunction ? NewArrowFunction :
- allocation.kind() == Allocation::Kind::GeneratorFunction ? NewGeneratorFunction : NewFunction;
</del><ins>+ NodeType nodeType = allocation.kind() == Allocation::Kind::NewArrowFunction ? NewArrowFunction : NewFunction;
</ins><span class="cx">
</span><span class="cx"> return m_graph.addNode(
</span><span class="cx"> allocation.identifier()->prediction(), nodeType,
</span><span class="lines">@@ -1790,7 +1782,6 @@
</span><span class="cx">
</span><span class="cx"> case NewArrowFunction:
</span><span class="cx"> case NewFunction:
</span><del>- case NewGeneratorFunction:
</del><span class="cx"> node->convertToPhantomNewFunction();
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -2042,8 +2033,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case NewFunction:
</span><del>- case NewArrowFunction:
- case NewGeneratorFunction: {
</del><ins>+ case NewArrowFunction: {
</ins><span class="cx"> Vector<PromotedHeapLocation> locations = m_locationsForAllocation.get(escapee);
</span><span class="cx"> ASSERT(locations.size() == 2);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPredictionPropagationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -209,8 +209,7 @@
</span><span class="cx"> case GetSetter:
</span><span class="cx"> case GetCallee:
</span><span class="cx"> case NewArrowFunction:
</span><del>- case NewFunction:
- case NewGeneratorFunction: {
</del><ins>+ case NewFunction: {
</ins><span class="cx"> changed |= setPrediction(SpecFunction);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSafeToExecuteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -268,7 +268,6 @@
</span><span class="cx"> case PutToArguments:
</span><span class="cx"> case NewArrowFunction:
</span><span class="cx"> case NewFunction:
</span><del>- case NewGeneratorFunction:
</del><span class="cx"> case Jump:
</span><span class="cx"> case Branch:
</span><span class="cx"> case Switch:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> #include "JSArrowFunction.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSEnvironmentRecord.h"
</span><del>-#include "JSGeneratorFunction.h"
</del><span class="cx"> #include "JSLexicalEnvironment.h"
</span><span class="cx"> #include "LinkBuffer.h"
</span><span class="cx"> #include "ScopedArguments.h"
</span><span class="lines">@@ -5373,7 +5372,7 @@
</span><span class="cx"> void SpeculativeJIT::compileNewFunction(Node* node)
</span><span class="cx"> {
</span><span class="cx"> NodeType nodeType = node->op();
</span><del>- ASSERT(nodeType == NewFunction || nodeType == NewArrowFunction || nodeType == NewGeneratorFunction);
</del><ins>+ ASSERT(nodeType == NewFunction || nodeType == NewArrowFunction);
</ins><span class="cx">
</span><span class="cx"> SpeculateCellOperand scope(this, node->child1());
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="lines">@@ -5411,8 +5410,6 @@
</span><span class="cx"> #else
</span><span class="cx"> callOperation(operationNewArrowFunction, resultGPR, scopeGPR, executable, thisValueTagGPR, thisValuePayloadGPR);
</span><span class="cx"> #endif
</span><del>- else if (nodeType == NewGeneratorFunction)
- callOperation(operationNewGeneratorFunction, resultGPR, scopeGPR, executable);
</del><span class="cx"> else
</span><span class="cx"> callOperation(operationNewFunction, resultGPR, scopeGPR, executable);
</span><span class="cx"> m_jit.exceptionCheck();
</span><span class="lines">@@ -5420,10 +5417,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Structure* structure =
- nodeType == NewArrowFunction ? m_jit.graph().globalObjectFor(node->origin.semantic)->arrowFunctionStructure() :
- nodeType == NewGeneratorFunction ? m_jit.graph().globalObjectFor(node->origin.semantic)->generatorFunctionStructure() :
- m_jit.graph().globalObjectFor(node->origin.semantic)->functionStructure();
</del><ins>+ Structure* structure = nodeType == NewArrowFunction
+ ? m_jit.graph().globalObjectFor(node->origin.semantic)->arrowFunctionStructure()
+ : m_jit.graph().globalObjectFor(node->origin.semantic)->functionStructure();
</ins><span class="cx">
</span><span class="cx"> GPRTemporary result(this);
</span><span class="cx"> GPRTemporary scratch1(this);
</span><span class="lines">@@ -5440,12 +5436,6 @@
</span><span class="cx">
</span><span class="cx"> addSlowPathGenerator(slowPathCall(slowPath, this, operationNewFunctionWithInvalidatedReallocationWatchpoint, resultGPR, scopeGPR, executable));
</span><span class="cx"> }
</span><del>-
- if (nodeType == NewGeneratorFunction) {
- compileNewFunctionCommon<JSGeneratorFunction>(resultGPR, structure, scratch1GPR, scratch2GPR, scopeGPR, slowPath, JSGeneratorFunction::allocationSize(0), executable, JSGeneratorFunction::offsetOfScopeChain(), JSGeneratorFunction::offsetOfExecutable(), JSGeneratorFunction::offsetOfRareData());
-
- addSlowPathGenerator(slowPathCall(slowPath, this, operationNewGeneratorFunctionWithInvalidatedReallocationWatchpoint, resultGPR, scopeGPR, executable));
- }
</del><span class="cx">
</span><span class="cx"> if (nodeType == NewArrowFunction) {
</span><span class="cx"> compileNewFunctionCommon<JSArrowFunction>(resultGPR, structure, scratch1GPR, scratch2GPR, scopeGPR, slowPath, JSArrowFunction::allocationSize(0), executable, JSArrowFunction::offsetOfScopeChain(), JSArrowFunction::offsetOfExecutable(), JSArrowFunction::offsetOfRareData());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -4408,7 +4408,6 @@
</span><span class="cx">
</span><span class="cx"> case NewFunction:
</span><span class="cx"> case NewArrowFunction:
</span><del>- case NewGeneratorFunction:
</del><span class="cx"> compileNewFunction(node);
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -4397,7 +4397,6 @@
</span><span class="cx">
</span><span class="cx"> case NewFunction:
</span><span class="cx"> case NewArrowFunction:
</span><del>- case NewGeneratorFunction:
</del><span class="cx"> compileNewFunction(node);
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGStoreBarrierInsertionPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGStoreBarrierInsertionPhase.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGStoreBarrierInsertionPhase.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGStoreBarrierInsertionPhase.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -306,7 +306,6 @@
</span><span class="cx"> case CreateClonedArguments:
</span><span class="cx"> case NewArrowFunction:
</span><span class="cx"> case NewFunction:
</span><del>- case NewGeneratorFunction:
</del><span class="cx"> // Nodes that allocate get to set their epoch because for those nodes we know
</span><span class="cx"> // that they will be the newest object in the heap.
</span><span class="cx"> m_node->setEpoch(m_currentEpoch);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGStructureRegistrationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -146,9 +146,6 @@
</span><span class="cx"> case NewFunction:
</span><span class="cx"> registerStructure(m_graph.globalObjectFor(node->origin.semantic)->functionStructure());
</span><span class="cx"> break;
</span><del>- case NewGeneratorFunction:
- registerStructure(m_graph.globalObjectFor(node->origin.semantic)->generatorFunctionStructure());
- break;
</del><span class="cx">
</span><span class="cx"> default:
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -111,7 +111,6 @@
</span><span class="cx"> case CreateActivation:
</span><span class="cx"> case NewArrowFunction:
</span><span class="cx"> case NewFunction:
</span><del>- case NewGeneratorFunction:
</del><span class="cx"> case GetClosureVar:
</span><span class="cx"> case PutClosureVar:
</span><span class="cx"> case CreateDirectArguments:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> #include "FTLWeightedTarget.h"
</span><span class="cx"> #include "JSArrowFunction.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><del>-#include "JSGeneratorFunction.h"
</del><span class="cx"> #include "JSLexicalEnvironment.h"
</span><span class="cx"> #include "OperandsInlines.h"
</span><span class="cx"> #include "ScopedArguments.h"
</span><span class="lines">@@ -755,7 +754,6 @@
</span><span class="cx"> break;
</span><span class="cx"> case NewFunction:
</span><span class="cx"> case NewArrowFunction:
</span><del>- case NewGeneratorFunction:
</del><span class="cx"> compileNewFunction();
</span><span class="cx"> break;
</span><span class="cx"> case CreateDirectArguments:
</span><span class="lines">@@ -3562,37 +3560,34 @@
</span><span class="cx">
</span><span class="cx"> void compileNewFunction()
</span><span class="cx"> {
</span><del>- ASSERT(m_node->op() == NewFunction || m_node->op() == NewArrowFunction || m_node->op() == NewGeneratorFunction);
</del><ins>+ ASSERT(m_node->op() == NewFunction || m_node->op() == NewArrowFunction);
+
</ins><span class="cx"> bool isArrowFunction = m_node->op() == NewArrowFunction;
</span><del>- bool isGeneratorFunction = m_node->op() == NewGeneratorFunction;
</del><span class="cx">
</span><span class="cx"> LValue scope = lowCell(m_node->child1());
</span><span class="cx"> LValue thisValue = isArrowFunction ? lowCell(m_node->child2()) : nullptr;
</span><span class="cx">
</span><span class="cx"> FunctionExecutable* executable = m_node->castOperand<FunctionExecutable*>();
</span><span class="cx"> if (executable->singletonFunction()->isStillValid()) {
</span><del>- LValue callResult =
- isArrowFunction ? vmCall(m_out.int64, m_out.operation(operationNewArrowFunction), m_callFrame, scope, weakPointer(executable), thisValue) :
- isGeneratorFunction ? vmCall(m_out.int64, m_out.operation(operationNewGeneratorFunction), m_callFrame, scope, weakPointer(executable)) :
- vmCall(m_out.int64, m_out.operation(operationNewFunction), m_callFrame, scope, weakPointer(executable));
</del><ins>+ LValue callResult = isArrowFunction
+ ? vmCall(m_out.int64, m_out.operation(operationNewArrowFunction), m_callFrame, scope, weakPointer(executable), thisValue)
+ : vmCall(m_out.int64, m_out.operation(operationNewFunction), m_callFrame, scope, weakPointer(executable));
</ins><span class="cx"> setJSValue(callResult);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Structure* structure =
- isArrowFunction ? m_graph.globalObjectFor(m_node->origin.semantic)->arrowFunctionStructure() :
- isGeneratorFunction ? m_graph.globalObjectFor(m_node->origin.semantic)->generatorFunctionStructure() :
- m_graph.globalObjectFor(m_node->origin.semantic)->functionStructure();
</del><ins>+ Structure* structure = isArrowFunction
+ ? m_graph.globalObjectFor(m_node->origin.semantic)->arrowFunctionStructure()
+ : m_graph.globalObjectFor(m_node->origin.semantic)->functionStructure();
</ins><span class="cx">
</span><span class="cx"> LBasicBlock slowPath = FTL_NEW_BLOCK(m_out, ("NewFunction slow path"));
</span><span class="cx"> LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("NewFunction continuation"));
</span><span class="cx">
</span><span class="cx"> LBasicBlock lastNext = m_out.insertNewBlocksBefore(slowPath);
</span><span class="cx">
</span><del>- LValue fastObject =
- isArrowFunction ? allocateObject<JSArrowFunction>(structure, m_out.intPtrZero, slowPath) :
- isGeneratorFunction ? allocateObject<JSGeneratorFunction>(structure, m_out.intPtrZero, slowPath) :
- allocateObject<JSFunction>(structure, m_out.intPtrZero, slowPath);
</del><ins>+ LValue fastObject = isArrowFunction
+ ? allocateObject<JSArrowFunction>(structure, m_out.intPtrZero, slowPath)
+ : allocateObject<JSFunction>(structure, m_out.intPtrZero, slowPath);
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> // We don't need memory barriers since we just fast-created the function, so it
</span><span class="lines">@@ -3622,12 +3617,6 @@
</span><span class="cx"> locations[0].directGPR(), locations[1].directGPR(),
</span><span class="cx"> CCallHelpers::TrustedImmPtr(executable), locations[2].directGPR());
</span><span class="cx"> }
</span><del>- if (isGeneratorFunction) {
- return createLazyCallGenerator(
- operationNewGeneratorFunctionWithInvalidatedReallocationWatchpoint,
- locations[0].directGPR(), locations[1].directGPR(),
- CCallHelpers::TrustedImmPtr(executable));
- }
</del><span class="cx"> return createLazyCallGenerator(
</span><span class="cx"> operationNewFunctionWithInvalidatedReallocationWatchpoint,
</span><span class="cx"> locations[0].directGPR(), locations[1].directGPR(),
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressgeneratorfunctioncreateoptimizedjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/generator-function-create-optimized.js (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/generator-function-create-optimized.js 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/tests/stress/generator-function-create-optimized.js 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-
-
-function *g() { }
-var GeneratorFunctionPrototype = g.__proto__;
-
-function test()
-{
- return function *gen()
- {
- yield 42;
- };
-}
-noInline(test);
-
-function test2()
-{
- function *gen()
- {
- yield 42;
- }
-
- return gen;
-}
-noInline(test2);
-
-for (var i = 0; i < 1e4; ++i) {
- shouldBe(test().__proto__, GeneratorFunctionPrototype);
- shouldBe(test2().__proto__, GeneratorFunctionPrototype);
-}
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressgeneratorfunctiondeclarationsinkingnodoubleallocatejs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/generator-function-declaration-sinking-no-double-allocate.js (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/generator-function-declaration-sinking-no-double-allocate.js 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/tests/stress/generator-function-declaration-sinking-no-double-allocate.js 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-var GeneratorFunctionPrototype = (function*(){}).__proto__;
-
-function call(o) { o.x = 3; }
-noInline(call);
-
-function sink (p, q) {
- function *f() { };
- if (p) {
- call(f); // Force allocation of f
- if (q) {
- OSRExit();
- }
- return f;
- }
- return { 'x': 2 };
-}
-noInline(sink);
-
-for (var i = 0; i < 100000; ++i) {
- var o = sink(true, false);
- shouldBe(o.__proto__, GeneratorFunctionPrototype);
- if (o.x != 3)
- throw "Error: expected o.x to be 2 but is " + result;
-}
-
-// At this point, the function should be compiled down to the FTL
-
-// Check that the function is properly allocated on OSR exit
-var f = sink(true, true);
-shouldBe(f.__proto__, GeneratorFunctionPrototype);
-if (f.x != 3)
- throw "Error: expected o.x to be 3 but is " + result;
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressgeneratorfunctiondeclarationsinkingosrexitjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/generator-function-declaration-sinking-osrexit.js (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/generator-function-declaration-sinking-osrexit.js 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/tests/stress/generator-function-declaration-sinking-osrexit.js 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-var GeneratorFunctionPrototype = (function*(){}).__proto__;
-
-function sink (p, q) {
- function *g(x) { return x; };
- if (p) { if (q) OSRExit(); return g; }
- function *f(x) { return x; };
- return f;
-}
-noInline(sink);
-
-for (var i = 0; i < 10000; ++i) {
- var f = sink(true, false);
- shouldBe(f.__proto__, GeneratorFunctionPrototype);
- var result = f(42);
- if (result.next().value != 42)
- throw "Error: expected 42 but got " + result;
-}
-
-// At this point, the function should be compiled down to the FTL
-
-// Check that the function is properly allocated on OSR exit
-var f = sink(true, true);
-shouldBe(f.__proto__, GeneratorFunctionPrototype);
-var result = f(42);
-if (result.next().value != 42)
- throw "Error: expected 42 but got " + result;
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressgeneratorfunctiondeclarationsinkingputjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/generator-function-declaration-sinking-put.js (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/generator-function-declaration-sinking-put.js 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/tests/stress/generator-function-declaration-sinking-put.js 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-var GeneratorFunctionPrototype = (function*(){}).__proto__;
-
-function sink (p, q) {
- function *g(x) { return x; };
- if (p) { if (q) g.inner = 42; return g; }
- function *f(x) { return x; };
- return f;
-}
-noInline(sink);
-
-for (var i = 0; i < 10000; ++i) {
- var f = sink(true, true);
- shouldBe(f.__proto__, GeneratorFunctionPrototype);
- var result = f(42);
- if (result.next().value != 42)
- throw "Error: expected 42 but got " + result;
-}
-
-// At this point, the function should be compiled down to the FTL
-
-// Test the allocation on the implicit inner else branch
-var f = sink(true, false);
-shouldBe(f.__proto__, GeneratorFunctionPrototype);
-var result = f(12);
-if (result.next().value != 12)
- // This shouldn't matter as it should be either correct or completely crash
- throw "Error: expected 12 but got " + result;
-
-// Check that the allocation did not sink beyond the property assignment
-var f = sink(true, true);
-shouldBe(f.__proto__, GeneratorFunctionPrototype);
-var result = f.inner;
-if (result != 42)
- throw "Error: inner should be 42 but is " + result;
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressgeneratorfunctionexpressionsinkingnodoubleallocatejs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/generator-function-expression-sinking-no-double-allocate.js (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/generator-function-expression-sinking-no-double-allocate.js 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/tests/stress/generator-function-expression-sinking-no-double-allocate.js 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-var GeneratorFunctionPrototype = (function*(){}).__proto__;
-
-function call(o) { o.x = 3; }
-noInline(call);
-
-function sink (p, q) {
- var f = function *() { };
- if (p) {
- call(f); // Force allocation of f
- if (q) {
- OSRExit();
- }
- return f;
- }
- return { 'x': 2 };
-}
-noInline(sink);
-
-for (var i = 0; i < 100000; ++i) {
- var o = sink(true, false);
- shouldBe(o.__proto__, GeneratorFunctionPrototype);
- if (o.x != 3)
- throw "Error: expected o.x to be 2 but is " + result;
-}
-
-// At this point, the function should be compiled down to the FTL
-
-// Check that the function is properly allocated on OSR exit
-var f = sink(true, true);
-shouldBe(f.__proto__, GeneratorFunctionPrototype);
-if (f.x != 3)
- throw "Error: expected o.x to be 3 but is " + result;
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressgeneratorfunctionexpressionsinkingosrexitjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/generator-function-expression-sinking-osrexit.js (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/generator-function-expression-sinking-osrexit.js 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/tests/stress/generator-function-expression-sinking-osrexit.js 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-var GeneratorFunctionPrototype = (function*(){}).__proto__;
-
-function sink (p, q) {
- var g = function *(x) { return x; };
- if (p) { if (q) OSRExit(); return g; }
- return function *(x) { return x; };
-}
-noInline(sink);
-
-for (var i = 0; i < 10000; ++i) {
- var f = sink(true, false);
- shouldBe(f.__proto__, GeneratorFunctionPrototype);
- var result = f(42);
- if (result.next().value != 42)
- throw "Error: expected 42 but got " + result;
-}
-
-// At this point, the function should be compiled down to the FTL
-
-// Check that the function is properly allocated on OSR exit
-var f = sink(true, true);
-shouldBe(f.__proto__, GeneratorFunctionPrototype);
-var result = f(42);
-if (result.next().value != 42)
- throw "Error: expected 42 but got " + result;
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressgeneratorfunctionexpressionsinkingputjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/generator-function-expression-sinking-put.js (194140 => 194141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/generator-function-expression-sinking-put.js 2015-12-16 11:13:07 UTC (rev 194140)
+++ trunk/Source/JavaScriptCore/tests/stress/generator-function-expression-sinking-put.js 2015-12-16 12:47:55 UTC (rev 194141)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-function shouldBe(actual, expected) {
- if (actual !== expected)
- throw new Error('bad value: ' + actual);
-}
-var GeneratorFunctionPrototype = (function*(){}).__proto__;
-
-function sink (p, q) {
- var g = function *(x) { return x; };
- if (p) { if (q) g.inner = 42; return g; }
- return function *(x) { return x; };
-}
-noInline(sink);
-
-for (var i = 0; i < 10000; ++i) {
- var f = sink(true, true);
- shouldBe(f.__proto__, GeneratorFunctionPrototype);
- var result = f(42);
- if (result.next().value != 42)
- throw "Error: expected 42 but got " + result;
-}
-
-// At this point, the function should be compiled down to the FTL
-
-// Test the allocation on the implicit inner else branch
-var f = sink(true, false);
-shouldBe(f.__proto__, GeneratorFunctionPrototype);
-var result = f(12);
-if (result.next().value != 12)
- // This shouldn't matter as it should be either correct or completely crash
- throw "Error: expected 12 but got " + result;
-
-// Check that the allocation did not sink beyond the property assignment
-var f = sink(true, true);
-shouldBe(f.__proto__, GeneratorFunctionPrototype);
-var result = f.inner;
-if (result != 42)
- throw "Error: inner should be 42 but is " + result;
</del></span></pre>
</div>
</div>
</body>
</html>