<!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>[207623] 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/207623">207623</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-10-20 10:40:19 -0700 (Thu, 20 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Invalid assertion in arguments elimination
https://bugs.webkit.org/show_bug.cgi?id=163740
<rdar://problem/27911462>
Reviewed by Michael Saboff.
JSTests:
* stress/direct-arguments-osr-entry.js: Added.
(foo.):
(foo):
Source/JavaScriptCore:
The DFGFTL's arguments elimination phase incorrectly asserted that a GetFromArguments' first
child would always be a CreateDirectArguments. While we only create the
op_get_from_arguments bytecode pointing to a create_direct_arguments, its possible for a
number of reasons that a DFG GetFromArguments may not point to a CreateDirectArguments. For
example, if we are OSR entering in some function with direct arguments the
CreateDirectArguments node might become ExtractOSREntryLocals.
* dfg/DFGArgumentsEliminationPhase.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGArgumentsEliminationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressdirectargumentsosrentryjs">trunk/JSTests/stress/direct-arguments-osr-entry.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (207622 => 207623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-10-20 17:25:01 UTC (rev 207622)
+++ trunk/JSTests/ChangeLog 2016-10-20 17:40:19 UTC (rev 207623)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-20 Keith Miller <keith_miller@apple.com>
+
+ Invalid assertion in arguments elimination
+ https://bugs.webkit.org/show_bug.cgi?id=163740
+ <rdar://problem/27911462>
+
+ Reviewed by Michael Saboff.
+
+ * stress/direct-arguments-osr-entry.js: Added.
+ (foo.):
+ (foo):
+
</ins><span class="cx"> 2016-10-20 Caitlin Potter <caitp@igalia.com>
</span><span class="cx">
</span><span class="cx"> [JSC] throw TypeError when constructing dynamically created JSGeneratorFunction
</span></span></pre></div>
<a id="trunkJSTestsstressdirectargumentsosrentryjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/direct-arguments-osr-entry.js (0 => 207623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/direct-arguments-osr-entry.js (rev 0)
+++ trunk/JSTests/stress/direct-arguments-osr-entry.js 2016-10-20 17:40:19 UTC (rev 207623)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+// This tests that arguments elimination works with OSR entry.
+// We need to have an inner call so that arguments elimination
+// sees there are potential candidates.
+
+var args;
+
+function foo(a)
+{
+ args = arguments;
+ var result = 0;
+ for (var i = 0; i < 1000000; ++i) {
+ (function() {
+ return arguments[0];
+ })(42);
+ result += a;
+ }
+ return result;
+}
+
+noInline(foo);
+
+foo(42);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207622 => 207623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-20 17:25:01 UTC (rev 207622)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-20 17:40:19 UTC (rev 207623)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-10-20 Keith Miller <keith_miller@apple.com>
+
+ Invalid assertion in arguments elimination
+ https://bugs.webkit.org/show_bug.cgi?id=163740
+ <rdar://problem/27911462>
+
+ Reviewed by Michael Saboff.
+
+ The DFGFTL's arguments elimination phase incorrectly asserted that a GetFromArguments' first
+ child would always be a CreateDirectArguments. While we only create the
+ op_get_from_arguments bytecode pointing to a create_direct_arguments, its possible for a
+ number of reasons that a DFG GetFromArguments may not point to a CreateDirectArguments. For
+ example, if we are OSR entering in some function with direct arguments the
+ CreateDirectArguments node might become ExtractOSREntryLocals.
+
+ * dfg/DFGArgumentsEliminationPhase.cpp:
+
</ins><span class="cx"> 2016-10-20 Caitlin Potter <caitp@igalia.com>
</span><span class="cx">
</span><span class="cx"> [JSC] throw TypeError when constructing dynamically created JSGeneratorFunction
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGArgumentsEliminationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp (207622 => 207623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp 2016-10-20 17:25:01 UTC (rev 207622)
+++ trunk/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp 2016-10-20 17:40:19 UTC (rev 207623)
</span><span class="lines">@@ -168,7 +168,6 @@
</span><span class="cx"> for (Node* node : *block) {
</span><span class="cx"> switch (node->op()) {
</span><span class="cx"> case GetFromArguments:
</span><del>- DFG_ASSERT(m_graph, node, node->child1()->op() == CreateDirectArguments);
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case GetByVal:
</span></span></pre>
</div>
</div>
</body>
</html>