<!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>[198928] 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/198928">198928</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-03-31 16:07:39 -0700 (Thu, 31 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ES6] Disallow var assignments in for-in loops
https://bugs.webkit.org/show_bug.cgi?id=155451
Reviewed by Mark Lam.
Source/JavaScriptCore:
We're doing this in its own patch instead of the patch for https://bugs.webkit.org/show_bug.cgi?id=155384
because last time we made this change it broke some websites. Lets try making
it again because it's what the ES6 mandates. If it still breaks things we will
roll it out.
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseForStatement):
LayoutTests:
* js/parser-syntax-check-expected.txt:
* js/script-tests/parser-syntax-check.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsparsersyntaxcheckexpectedtxt">trunk/LayoutTests/js/parser-syntax-check-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsparsersyntaxcheckjs">trunk/LayoutTests/js/script-tests/parser-syntax-check.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198927 => 198928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-31 23:01:29 UTC (rev 198927)
+++ trunk/LayoutTests/ChangeLog 2016-03-31 23:07:39 UTC (rev 198928)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-03-31 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><ins>+ [ES6] Disallow var assignments in for-in loops
+ https://bugs.webkit.org/show_bug.cgi?id=155451
+
+ Reviewed by Mark Lam.
+
+ * js/parser-syntax-check-expected.txt:
+ * js/script-tests/parser-syntax-check.js:
+
+2016-03-31 Saam barati <sbarati@apple.com>
+
</ins><span class="cx"> parsing arrow function expressions slows down the parser by 8% lets recoup some loss
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155988
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsjsparsersyntaxcheckexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/parser-syntax-check-expected.txt (198927 => 198928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/parser-syntax-check-expected.txt 2016-03-31 23:01:29 UTC (rev 198927)
+++ trunk/LayoutTests/js/parser-syntax-check-expected.txt 2016-03-31 23:07:39 UTC (rev 198928)
</span><span class="lines">@@ -504,10 +504,10 @@
</span><span class="cx"> PASS Valid: "function f() { for ((a ? b : c) in c) break }"
</span><span class="cx"> PASS Valid: "for (var a in b in c) break" with ReferenceError
</span><span class="cx"> PASS Valid: "function f() { for (var a in b in c) break }"
</span><del>-PASS Valid: "for (var a = 5 += 6 in b) break" with ReferenceError
-PASS Valid: "function f() { for (var a = 5 += 6 in b) break }"
-PASS Valid: "for (var a = debug('should not be hit') in b) break" with ReferenceError
-PASS Valid: "function f() { for (var a = debug('should not be hit') in b) break }"
</del><ins>+PASS Invalid: "for (var a = 5 += 6 in b) break"
+PASS Invalid: "function f() { for (var a = 5 += 6 in b) break }"
+PASS Invalid: "for (var a = debug('should not be hit') in b) break"
+PASS Invalid: "function f() { for (var a = debug('should not be hit') in b) break }"
</ins><span class="cx"> PASS Invalid: "for (var a += 5 in b) break"
</span><span class="cx"> PASS Invalid: "function f() { for (var a += 5 in b) break }"
</span><span class="cx"> PASS Invalid: "for (var a = in b) break"
</span><span class="lines">@@ -518,8 +518,8 @@
</span><span class="cx"> PASS Invalid: "function f() { for (var a = -6, b in b) break }"
</span><span class="cx"> PASS Invalid: "for (var a, b = 8 in b) break"
</span><span class="cx"> PASS Invalid: "function f() { for (var a, b = 8 in b) break }"
</span><del>-PASS Valid: "for (var a = (b in c) in d) break" with ReferenceError
-PASS Valid: "function f() { for (var a = (b in c) in d) break }"
</del><ins>+PASS Invalid: "for (var a = (b in c) in d) break"
+PASS Invalid: "function f() { for (var a = (b in c) in d) break }"
</ins><span class="cx"> PASS Invalid: "for (var a = (b in c in d) break"
</span><span class="cx"> PASS Invalid: "function f() { for (var a = (b in c in d) break }"
</span><span class="cx"> PASS Invalid: "for (var (a) in b) { }"
</span><span class="lines">@@ -532,8 +532,8 @@
</span><span class="cx"> PASS Invalid: "function f() { for (var {a} = 20 of b) { } }"
</span><span class="cx"> PASS Invalid: "for (var {a} = 20 in b) { }"
</span><span class="cx"> PASS Invalid: "function f() { for (var {a} = 20 in b) { } }"
</span><del>-PASS Valid: "for (var i = 20 in b) { }" with ReferenceError
-PASS Valid: "function f() { for (var i = 20 in b) { } }"
</del><ins>+PASS Invalid: "for (var i = 20 in b) { }"
+PASS Invalid: "function f() { for (var i = 20 in b) { } }"
</ins><span class="cx"> PASS Invalid: "for (var i = 20 of b) { }"
</span><span class="cx"> PASS Invalid: "function f() { for (var i = 20 of b) { } }"
</span><span class="cx"> PASS Invalid: "for (var {i} = 20 of b) { }"
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsparsersyntaxcheckjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/parser-syntax-check.js (198927 => 198928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/parser-syntax-check.js 2016-03-31 23:01:29 UTC (rev 198927)
+++ trunk/LayoutTests/js/script-tests/parser-syntax-check.js 2016-03-31 23:07:39 UTC (rev 198928)
</span><span class="lines">@@ -333,21 +333,21 @@
</span><span class="cx"> invalid("for (a ? b : c in c) break");
</span><span class="cx"> valid ("for ((a ? b : c) in c) break");
</span><span class="cx"> valid ("for (var a in b in c) break");
</span><del>-valid("for (var a = 5 += 6 in b) break");
-valid("for (var a = debug('should not be hit') in b) break");
</del><ins>+invalid("for (var a = 5 += 6 in b) break");
+invalid("for (var a = debug('should not be hit') in b) break");
</ins><span class="cx"> invalid("for (var a += 5 in b) break");
</span><span class="cx"> invalid("for (var a = in b) break");
</span><span class="cx"> invalid("for (var a, b in b) break");
</span><span class="cx"> invalid("for (var a = -6, b in b) break");
</span><span class="cx"> invalid("for (var a, b = 8 in b) break");
</span><del>-valid("for (var a = (b in c) in d) break");
</del><ins>+invalid("for (var a = (b in c) in d) break");
</ins><span class="cx"> invalid("for (var a = (b in c in d) break");
</span><span class="cx"> invalid("for (var (a) in b) { }");
</span><span class="cx"> valid ("for (var a = 7, b = c < d >= d ; f()[6]++ ; --i()[1]++ ) {}");
</span><span class="cx"> invalid("for (var {a} = 20 in b) { }");
</span><span class="cx"> invalid("for (var {a} = 20 of b) { }");
</span><span class="cx"> invalid("for (var {a} = 20 in b) { }");
</span><del>-valid("for (var i = 20 in b) { }");
</del><ins>+invalid("for (var i = 20 in b) { }");
</ins><span class="cx"> invalid("for (var i = 20 of b) { }");
</span><span class="cx"> invalid("for (var {i} = 20 of b) { }");
</span><span class="cx"> invalid("for (var [i] = 20 of b) { }");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198927 => 198928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-31 23:01:29 UTC (rev 198927)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-31 23:07:39 UTC (rev 198928)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-03-31 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><ins>+ [ES6] Disallow var assignments in for-in loops
+ https://bugs.webkit.org/show_bug.cgi?id=155451
+
+ Reviewed by Mark Lam.
+
+ We're doing this in its own patch instead of the patch for https://bugs.webkit.org/show_bug.cgi?id=155384
+ because last time we made this change it broke some websites. Lets try making
+ it again because it's what the ES6 mandates. If it still breaks things we will
+ roll it out.
+
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseForStatement):
+
+2016-03-31 Saam barati <sbarati@apple.com>
+
</ins><span class="cx"> parsing arrow function expressions slows down the parser by 8% lets recoup some loss
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155988
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (198927 => 198928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2016-03-31 23:01:29 UTC (rev 198927)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2016-03-31 23:07:39 UTC (rev 198928)
</span><span class="lines">@@ -1168,8 +1168,7 @@
</span><span class="cx"> if (hasAnyAssignments) {
</span><span class="cx"> if (isOfEnumeration)
</span><span class="cx"> internalFailWithMessage(false, "Cannot assign to the loop variable inside a for-of loop header");
</span><del>- if (strictMode() || (isLetDeclaration || isConstDeclaration) || !context.isBindingNode(forInTarget))
- internalFailWithMessage(false, "Cannot assign to the loop variable inside a for-in loop header");
</del><ins>+ internalFailWithMessage(false, "Cannot assign to the loop variable inside a for-in loop header");
</ins><span class="cx"> }
</span><span class="cx"> TreeExpression expr = parseExpression(context);
</span><span class="cx"> failIfFalse(expr, "Expected expression to enumerate");
</span></span></pre>
</div>
</div>
</body>
</html>