<!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>[182109] 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/182109">182109</a></dd>
<dt>Author</dt> <dd>saambarati1@gmail.com</dd>
<dt>Date</dt> <dd>2015-03-27 23:01:33 -0700 (Fri, 27 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deconstruction parameters are bound too late
https://bugs.webkit.org/show_bug.cgi?id=143148
Reviewed by Filip Pizlo.
Source/JavaScriptCore:
Currently, a deconstruction pattern named with the same
name as a function will shadow the function. This is
wrong. It should be the other way around.
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::generate):
LayoutTests:
* js/regress/deconstructing-parameters-overridden-by-function-expected.txt: Added.
* js/regress/deconstructing-parameters-overridden-by-function.html: Added.
* js/regress/script-tests/deconstructing-parameters-overridden-by-function.js: Added.
(f):
(test):
(.arg):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregressdeconstructingparametersoverriddenbyfunctionexpectedtxt">trunk/LayoutTests/js/regress/deconstructing-parameters-overridden-by-function-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregressdeconstructingparametersoverriddenbyfunctionhtml">trunk/LayoutTests/js/regress/deconstructing-parameters-overridden-by-function.html</a></li>
<li><a href="#trunkLayoutTestsjsregressscripttestsdeconstructingparametersoverriddenbyfunctionjs">trunk/LayoutTests/js/regress/script-tests/deconstructing-parameters-overridden-by-function.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182108 => 182109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-28 05:45:27 UTC (rev 182108)
+++ trunk/LayoutTests/ChangeLog 2015-03-28 06:01:33 UTC (rev 182109)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-27 Saam Barati <saambarati1@gmail.com>
+
+ Deconstruction parameters are bound too late
+ https://bugs.webkit.org/show_bug.cgi?id=143148
+
+ Reviewed by Filip Pizlo.
+
+ * js/regress/deconstructing-parameters-overridden-by-function-expected.txt: Added.
+ * js/regress/deconstructing-parameters-overridden-by-function.html: Added.
+ * js/regress/script-tests/deconstructing-parameters-overridden-by-function.js: Added.
+ (f):
+ (test):
+ (.arg):
+
</ins><span class="cx"> 2015-03-27 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix flakey dfg-int8array.js and dfg-int16array.js tests for ARM64
</span></span></pre></div>
<a id="trunkLayoutTestsjsregressdeconstructingparametersoverriddenbyfunctionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/deconstructing-parameters-overridden-by-function-expected.txt (0 => 182109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/deconstructing-parameters-overridden-by-function-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress/deconstructing-parameters-overridden-by-function-expected.txt 2015-03-28 06:01:33 UTC (rev 182109)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/deconstructing-parameters-overridden-by-function
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressdeconstructingparametersoverriddenbyfunctionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/deconstructing-parameters-overridden-by-function.html (0 => 182109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/deconstructing-parameters-overridden-by-function.html (rev 0)
+++ trunk/LayoutTests/js/regress/deconstructing-parameters-overridden-by-function.html 2015-03-28 06:01:33 UTC (rev 182109)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="../../resources/regress-pre.js"></script>
+<script src="script-tests/deconstructing-parameters-overridden-by-function.js"></script>
+<script src="../../resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregressscripttestsdeconstructingparametersoverriddenbyfunctionjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress/script-tests/deconstructing-parameters-overridden-by-function.js (0 => 182109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress/script-tests/deconstructing-parameters-overridden-by-function.js (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/deconstructing-parameters-overridden-by-function.js 2015-03-28 06:01:33 UTC (rev 182109)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+function f() { return 40; }
+function test({arg}) {
+ function arg() { return 41; }
+ return arg;
+}
+noInline(test);
+
+for (var i = 0; i < 1000; i++) {
+ if (test({arg: f})() !== 41)
+ throw new Error("bad value");
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (182108 => 182109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-28 05:45:27 UTC (rev 182108)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-28 06:01:33 UTC (rev 182109)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-27 Saam Barati <saambarati1@gmail.com>
+
+ Deconstruction parameters are bound too late
+ https://bugs.webkit.org/show_bug.cgi?id=143148
+
+ Reviewed by Filip Pizlo.
+
+ Currently, a deconstruction pattern named with the same
+ name as a function will shadow the function. This is
+ wrong. It should be the other way around.
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::generate):
+
</ins><span class="cx"> 2015-03-27 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> parse doesn't initialize the 16-bit version of the JSC parser with defaultConstructorKind
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (182108 => 182109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2015-03-28 05:45:27 UTC (rev 182108)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2015-03-28 06:01:33 UTC (rev 182109)
</span><span class="lines">@@ -69,7 +69,12 @@
</span><span class="cx"> // perform that assignment now.
</span><span class="cx"> if (m_needToInitializeArguments)
</span><span class="cx"> initializeVariable(variable(propertyNames().arguments), m_argumentsRegister);
</span><del>-
</del><ins>+
+ for (size_t i = 0; i < m_deconstructedParameters.size(); i++) {
+ auto& entry = m_deconstructedParameters[i];
+ entry.second->bindValue(*this, entry.first.get());
+ }
+
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<RegisterID> temp = newTemporary();
</span><span class="cx"> for (FunctionBodyNode* functionBody : m_functionsToInitialize) {
</span><span class="lines">@@ -78,11 +83,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (size_t i = 0; i < m_deconstructedParameters.size(); i++) {
- auto& entry = m_deconstructedParameters[i];
- entry.second->bindValue(*this, entry.first.get());
- }
-
</del><span class="cx"> bool callingClassConstructor = constructorKind() != ConstructorKind::None && !isConstructor();
</span><span class="cx"> if (!callingClassConstructor)
</span><span class="cx"> m_scopeNode->emitBytecode(*this);
</span></span></pre>
</div>
</div>
</body>
</html>