<!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>[201892] 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/201892">201892</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2016-06-09 16:30:39 -0700 (Thu, 09 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ES6: Reusing function name as a parameter name shouldn't throw Syntax Error
https://bugs.webkit.org/show_bug.cgi?id=158575
Reviewed by Benjamin Poulain.
Source/JavaScriptCore:
The check for a parameter with a duplicate name doesn't take into account the
type of the prior variable. Added a check that the duplicate is also a
parameter.
See the relevant spec section at:
http://www.ecma-international.org/ecma-262/6.0/#sec-function-definitions-static-semantics-early-errors
* parser/Parser.h:
(JSC::Scope::declareParameter):
LayoutTests:
Added a new test case.
* js/basic-strict-mode-expected.txt:
* js/script-tests/basic-strict-mode.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsbasicstrictmodeexpectedtxt">trunk/LayoutTests/js/basic-strict-mode-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsbasicstrictmodejs">trunk/LayoutTests/js/script-tests/basic-strict-mode.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserh">trunk/Source/JavaScriptCore/parser/Parser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201891 => 201892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-06-09 22:55:52 UTC (rev 201891)
+++ trunk/LayoutTests/ChangeLog        2016-06-09 23:30:39 UTC (rev 201892)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-06-09 Michael Saboff <msaboff@apple.com>
+
+ ES6: Reusing function name as a parameter name shouldn't throw Syntax Error
+ https://bugs.webkit.org/show_bug.cgi?id=158575
+
+ Reviewed by Benjamin Poulain.
+
+ Added a new test case.
+
+ * js/basic-strict-mode-expected.txt:
+ * js/script-tests/basic-strict-mode.js:
+
</ins><span class="cx"> 2016-06-09 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Changing canvas height immediately after page load does not relayout canvas
</span></span></pre></div>
<a id="trunkLayoutTestsjsbasicstrictmodeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/basic-strict-mode-expected.txt (201891 => 201892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/basic-strict-mode-expected.txt        2016-06-09 22:55:52 UTC (rev 201891)
+++ trunk/LayoutTests/js/basic-strict-mode-expected.txt        2016-06-09 23:30:39 UTC (rev 201892)
</span><span class="lines">@@ -68,6 +68,9 @@
</span><span class="cx"> PASS (function f(arg){'use strict'; f.caller; })() threw exception TypeError: 'arguments', 'callee', and 'caller' cannot be accessed in strict mode..
</span><span class="cx"> PASS (function f(arg){'use strict'; f.arguments=5; })() threw exception TypeError: 'arguments', 'callee', and 'caller' cannot be accessed in strict mode..
</span><span class="cx"> PASS (function f(arg){'use strict'; f.caller=5; })() threw exception TypeError: 'arguments', 'callee', and 'caller' cannot be accessed in strict mode..
</span><ins>+PASS (function a(a){'use strict'; return a+2; })(40) is 42
+PASS var foo = function a(a){'use strict'; return a+2; }; foo(40) is 42
+PASS var o = {foo: function a(a){'use strict'; return a+2; } }; o.foo(40) is 42
</ins><span class="cx"> PASS "caller" in function(){"use strict"} is true
</span><span class="cx"> PASS (function(){"use strict";}).hasOwnProperty("caller") is true
</span><span class="cx"> PASS "arguments" in function(){"use strict"} is true
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsbasicstrictmodejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/basic-strict-mode.js (201891 => 201892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/basic-strict-mode.js        2016-06-09 22:55:52 UTC (rev 201891)
+++ trunk/LayoutTests/js/script-tests/basic-strict-mode.js        2016-06-09 23:30:39 UTC (rev 201892)
</span><span class="lines">@@ -85,6 +85,9 @@
</span><span class="cx"> shouldThrow("(function f(arg){'use strict'; f.caller; })()");
</span><span class="cx"> shouldThrow("(function f(arg){'use strict'; f.arguments=5; })()");
</span><span class="cx"> shouldThrow("(function f(arg){'use strict'; f.caller=5; })()");
</span><ins>+shouldBe("(function a(a){'use strict'; return a+2; })(40)", "42");
+shouldBe("var foo = function a(a){'use strict'; return a+2; }; foo(40)", "42");
+shouldBe("var o = {foo: function a(a){'use strict'; return a+2; } }; o.foo(40)", "42");
</ins><span class="cx">
</span><span class="cx"> // arguments/caller poisoning should be visible but not throw with 'in' & 'hasOwnProperty'.
</span><span class="cx"> shouldBeTrue('"caller" in function(){"use strict"}');
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201891 => 201892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-06-09 22:55:52 UTC (rev 201891)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-06-09 23:30:39 UTC (rev 201892)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-06-09 Michael Saboff <msaboff@apple.com>
+
+ ES6: Reusing function name as a parameter name shouldn't throw Syntax Error
+ https://bugs.webkit.org/show_bug.cgi?id=158575
+
+ Reviewed by Benjamin Poulain.
+
+ The check for a parameter with a duplicate name doesn't take into account the
+ type of the prior variable. Added a check that the duplicate is also a
+ parameter.
+
+ See the relevant spec section at:
+ http://www.ecma-international.org/ecma-262/6.0/#sec-function-definitions-static-semantics-early-errors
+
+ * parser/Parser.h:
+ (JSC::Scope::declareParameter):
+
</ins><span class="cx"> 2016-06-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r201836, r201845, and r201848.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.h (201891 => 201892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.h        2016-06-09 22:55:52 UTC (rev 201891)
+++ trunk/Source/JavaScriptCore/parser/Parser.h        2016-06-09 23:30:39 UTC (rev 201892)
</span><span class="lines">@@ -479,9 +479,10 @@
</span><span class="cx"> DeclarationResultMask result = DeclarationResult::Valid;
</span><span class="cx"> bool isArgumentsIdent = isArguments(m_vm, ident);
</span><span class="cx"> auto addResult = m_declaredVariables.add(ident->impl());
</span><ins>+ bool isValidStrictMode = (addResult.isNewEntry || !addResult.iterator->value.isParameter())
+ && m_vm->propertyNames->eval != *ident && !isArgumentsIdent;
</ins><span class="cx"> addResult.iterator->value.clearIsVar();
</span><span class="cx"> addResult.iterator->value.setIsParameter();
</span><del>- bool isValidStrictMode = addResult.isNewEntry && m_vm->propertyNames->eval != *ident && !isArgumentsIdent;
</del><span class="cx"> m_isValidStrictMode = m_isValidStrictMode && isValidStrictMode;
</span><span class="cx"> m_declaredParameters.add(ident->impl());
</span><span class="cx"> if (!isValidStrictMode)
</span></span></pre>
</div>
</div>
</body>
</html>