Changeset 202865 in webkit

Timestamp:

Jul 6, 2016 11:22:17 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r198928 and r198985.
​https://bugs.webkit.org/show_bug.cgi?id=159478

"It's breaking some websites" (Requested by saamyjoon on
#webkit).

Reverted changesets:

"[ES6] Disallow var assignments in for-in loops"
​https://bugs.webkit.org/show_bug.cgi?id=155451
​http://trac.webkit.org/changeset/198928

"Unreviewed, turn ES6 for-in loop test success"
​https://bugs.webkit.org/show_bug.cgi?id=155451
​http://trac.webkit.org/changeset/198985

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/parser-syntax-check-expected.txt (modified) (3 diffs)
• LayoutTests/js/script-tests/parser-syntax-check.js (modified) (3 diffs)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.cpp (modified) (1 diff)
• Source/JavaScriptCore/tests/es6.yaml (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-07-06  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r198928 and r198985.
+        https://bugs.webkit.org/show_bug.cgi?id=159478
+
+        "It's breaking some websites" (Requested by saamyjoon on
+        #webkit).
+
+        Reverted changesets:
+
+        "[ES6] Disallow var assignments in for-in loops"
+        https://bugs.webkit.org/show_bug.cgi?id=155451
+        http://trac.webkit.org/changeset/198928
+
+        "Unreviewed, turn ES6 for-in loop test success"
+        https://bugs.webkit.org/show_bug.cgi?id=155451
+        http://trac.webkit.org/changeset/198985
+
 2016-07-06  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/js/parser-syntax-check-expected.txt

@@ -505 +505 @@
 PASS Valid:   "for (var a in b in c) break" with ReferenceError
 PASS Valid:   "function f() { for (var a in b in c) break }"
-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 }"
+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 }"
 PASS Invalid: "for (var a += 5 in b) break"
 PASS Invalid: "function f() { for (var a += 5 in b) break }"
@@ -519 +519 @@
 PASS Invalid: "for (var a, b = 8 in b) break"
 PASS Invalid: "function f() { for (var a, b = 8 in b) break }"
-PASS Invalid: "for (var a = (b in c) in d) break"
-PASS Invalid: "function f() { for (var a = (b in c) in d) break }"
+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 }"
 PASS Invalid: "for (var a = (b in c in d) break"
 PASS Invalid: "function f() { for (var a = (b in c in d) break }"
@@ -533 +533 @@
 PASS Invalid: "for (var {a} = 20 in b) { }"
 PASS Invalid: "function f() { for (var {a} = 20 in b) { } }"
-PASS Invalid: "for (var i = 20 in b) { }"
-PASS Invalid: "function f() { for (var i = 20 in b) { } }"
+PASS Valid:   "for (var i = 20 in b) { }" with ReferenceError
+PASS Valid:   "function f() { for (var i = 20 in b) { } }"
 PASS Invalid: "for (var i = 20 of b) { }"
 PASS Invalid: "function f() { for (var i = 20 of b) { } }"

trunk/LayoutTests/js/script-tests/parser-syntax-check.js

@@ -346 +346 @@
 valid  ("for ((a ? b : c) in c) break");
 valid  ("for (var a in b in c) break");
-invalid("for (var a = 5 += 6 in b) break");
-invalid("for (var a = debug('should not be hit') in b) break");
+valid("for (var a = 5 += 6 in b) break");
+valid("for (var a = debug('should not be hit') in b) break");
 invalid("for (var a += 5 in b) break");
 invalid("for (var a = in b) break");
@@ -353 +353 @@
 invalid("for (var a = -6, b in b) break");
 invalid("for (var a, b = 8 in b) break");
-invalid("for (var a = (b in c) in d) break");
+valid("for (var a = (b in c) in d) break");
 invalid("for (var a = (b in c in d) break");
 invalid("for (var (a) in b) { }");
@@ -360 +360 @@
 invalid("for (var {a} = 20 of b) { }");
 invalid("for (var {a} = 20 in b) { }");
-invalid("for (var i = 20 in b) { }");
+valid("for (var i = 20 in b) { }");
 invalid("for (var i = 20 of b) { }");
 invalid("for (var {i} = 20 of b) { }");

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-07-06  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r198928 and r198985.
+        https://bugs.webkit.org/show_bug.cgi?id=159478
+
+        "It's breaking some websites" (Requested by saamyjoon on
+        #webkit).
+
+        Reverted changesets:
+
+        "[ES6] Disallow var assignments in for-in loops"
+        https://bugs.webkit.org/show_bug.cgi?id=155451
+        http://trac.webkit.org/changeset/198928
+
+        "Unreviewed, turn ES6 for-in loop test success"
+        https://bugs.webkit.org/show_bug.cgi?id=155451
+        http://trac.webkit.org/changeset/198985
+
 2016-07-05  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1181 +1181 @@
             if (isOfEnumeration)
                 internalFailWithMessage(false, "Cannot assign to the loop variable inside a for-of loop header");
-            internalFailWithMessage(false, "Cannot assign to the loop variable inside a for-in loop header");
+            if (strictMode() || (isLetDeclaration || isConstDeclaration) || !context.isBindingNode(forInTarget))
+                internalFailWithMessage(false, "Cannot assign to the loop variable inside a for-in loop header");
         }
         TreeExpression expr = parseExpression(context);

trunk/Source/JavaScriptCore/tests/es6.yaml

@@ -876 +876 @@
   cmd: runES6 :normal
 - path: es6/miscellaneous_no_assignments_allowed_in_for-in_head.js
-  cmd: runES6 :normal
+  cmd: runES6 :fail
 - path: es6/miscellaneous_RegExp_constructor_can_alter_flags.js
   cmd: runES6 :normal