Changeset 204895 in webkit

Timestamp:

Aug 24, 2016 6:35:38 AM (8 years ago)

Author:

gskachkov@gmail.com

Message:

2016] Allow assignment in for-in head in not-strict mode
​https://bugs.webkit.org/show_bug.cgi?id=160955

Reviewed by Saam Barati.

This patch allow make assignment in for..in head in not-strict mode,
according to the spec ​https://tc39.github.io/ecma262/#sec-initializers-in-forin-statement-heads

Source/JavaScriptCore:

• bytecompiler/NodesCodegen.cpp:

(JSC::ForInNode::emitLoopHeader):
(JSC::ForInNode::emitMultiLoopBytecode):

• parser/Nodes.h:

(JSC::ExpressionNode::isAssignResolveNode):
(JSC::AssignResolveNode::identifier):
(JSC::ExpressionNode::isResolveNode): Deleted.

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseForStatement):

JSTests:

• stress/for-in-tests.js:

(foo):
(boo):
(catch):

LayoutTests:

• js/parser-syntax-check-expected.txt:
• js/script-tests/parser-syntax-check.js:

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/for-in-tests.js (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/parser-syntax-check-expected.txt (modified) (1 diff)
• LayoutTests/js/script-tests/parser-syntax-check.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (modified) (4 diffs)
• Source/JavaScriptCore/parser/Nodes.h (modified) (2 diffs)
• Source/JavaScriptCore/parser/Parser.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2016-08-24  Skachkov Oleksandr  <gskachkov@gmail.com>
+
+        [ES2016] Allow assignment in for-in head in not-strict mode
+        https://bugs.webkit.org/show_bug.cgi?id=160955
+
+        Reviewed by Saam Barati.
+
+        * stress/for-in-tests.js:
+        (foo):
+        (boo):
+        (catch):
+
 2016-08-23  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/JSTests/stress/for-in-tests.js

@@ -99 +99 @@
     }
 })();
+
+(function() {
+    var foo = function(a, b) {
+        for (var p = b in a) {}
+        return p;
+    };
+    noInline(foo);
+    for (var i = 0; i < 10000; ++i) {
+        var expected = 'expected-result';
+        var result = foo({}, expected);
+        if (expected !== result)
+            throw new Error("bad result: " + result + "!==" + expected);
+    }
+    for (var i = 0; i < 10000; ++i) {
+        var expected = 'a';
+        var result = foo({a:'abcd'}, expected);
+        if (expected !== result)
+            throw new Error("bad result: " + result + "!==" + expected);
+    }
+    for (var i = 0; i < 10000; ++i) {
+        var expected = 'b';
+        var result = foo({a:'abcd', b: 'bcde'}, expected);
+        if (expected !== result)
+            throw new Error("bad result: " + result + "!==" + expected);
+    }
+
+    for (var i = 0; i < 10000; ++i) {
+        var expected = 'c';
+        var o = {a:'abcd', b: 'bcde'};
+        o.c = 'cdef';
+        var result = foo(o, expected);
+        if (expected !== result)
+            throw new Error("bad result: " + result + "!==" + expected);
+    }
+})();
+
+(function() {
+    var boo = function () { return 'expected-result'; };
+    var foo = function(a) {
+        for (var p = boo() in a) {}
+        return p;
+    };
+    noInline(foo);
+    for (var i = 0; i < 10000; ++i) {
+        var expected = 'expected-result';
+        var result = foo({});
+        if (expected !== result)
+            throw new Error("bad result: " + result + "!==" + expected);
+    }
+})();
+
+(function() {
+    var foo = function(a, b, first) {
+        {   
+            let p = 'some-value';
+            for (var p = b in a) {}
+            if (first)
+                return p;
+        }
+        return p;
+    };
+    noInline(foo);
+    for (var i = 0; i < 10000; ++i) {
+        var expected = 'expected-result';
+        var result = foo({}, expected, true);
+        if (expected !== result)
+            throw new Error("bad result: " + result + "!==" + expected);
+    }
+    for (var i = 0; i < 10000; ++i) {
+        var expected = 'expected-result';
+        var result = foo({}, expected, false);
+        if (typeof result !== 'undefined')
+            throw new Error("bad result: " + result + "!== undefined");
+    }
+})();
+
+(function() {
+    var foo = function(a, b, c) {
+        for (var p = b + c in a) {}
+        return p;
+    };
+    noInline(foo);
+    for (var i = 0; i < 10000; ++i) {
+        var expected = 'expected-result';
+        var result = foo({}, 'expected', '-result');
+        if (expected !== result)
+            throw new Error("bad result: " + result + "!==" + expected);
+    }
+})();
+
+(function() {
+    var error = false;
+    try {
+        eval("(function() { 'use strict'; for (var i = 0 in {}) {}})()");
+    } catch(e) {
+        error = e instanceof SyntaxError;
+    }
+    if (!error)
+        throw new Error("Expected SyntaxError error");
+})();
+
+(function() {
+    var error = false;
+    try {
+        eval("(function() { const i = 10; for (var i = 0 in {}) {}})()");
+    } catch(e) {
+        error = e instanceof SyntaxError;
+    }
+    if (!error)
+        throw new Error("Expected SyntaxError error");
+})();

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-08-24  Skachkov Oleksandr  <gskachkov@gmail.com>
+
+        [ES2016] Allow assignment in for-in head in not-strict mode
+        https://bugs.webkit.org/show_bug.cgi?id=160955
+
+        Reviewed by Saam Barati.
+
+        * js/parser-syntax-check-expected.txt:
+        * js/script-tests/parser-syntax-check.js:
+
 2016-08-24  Youenn Fablet  <youenn@apple.com>
 

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

@@ -507 +507 @@
 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 Valid:   "for (var a = foo('should be hit') in b) break" with ReferenceError
+PASS Valid:   "function f() { for (var a = foo('should 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 }"

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

@@ -347 +347 @@
 valid  ("for (var a in b in c) break");
 valid("for (var a = 5 += 6 in b) break");
-valid("for (var a = debug('should not be hit') in b) break");
+valid("for (var a = foo('should be hit') in b) break");
 invalid("for (var a += 5 in b) break");
 invalid("for (var a = in b) break");

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-08-24  Skachkov Oleksandr  <gskachkov@gmail.com>
+
+        [ES2016] Allow assignment in for-in head in not-strict mode
+        https://bugs.webkit.org/show_bug.cgi?id=160955
+
+        Reviewed by Saam Barati.
+
+        This patch allow make assignment in for..in head in not-strict mode, 
+        according to the spec https://tc39.github.io/ecma262/#sec-initializers-in-forin-statement-heads
+
+        * bytecompiler/NodesCodegen.cpp:
+        (JSC::ForInNode::emitLoopHeader):
+        (JSC::ForInNode::emitMultiLoopBytecode):
+        * parser/Nodes.h:
+        (JSC::ExpressionNode::isAssignResolveNode):
+        (JSC::AssignResolveNode::identifier):
+        (JSC::ExpressionNode::isResolveNode): Deleted.
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parseForStatement):
+
 2016-08-23  Saam Barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

@@ -2560 +2560 @@
 void ForInNode::emitLoopHeader(BytecodeGenerator& generator, RegisterID* propertyName)
 {
-    if (m_lexpr->isResolveNode()) {
-        const Identifier& ident = static_cast<ResolveNode*>(m_lexpr)->identifier();
+    auto lambdaEmitResolveVariable = [&](const Identifier& ident)
+    {
         Variable var = generator.variable(ident);
         if (RegisterID* local = var.local()) {
@@ -2577 +2577 @@
         }
         generator.emitProfileType(propertyName, var, m_lexpr->position(), JSTextPosition(-1, m_lexpr->position().offset + ident.length(), -1));
+    };
+
+    if (m_lexpr->isResolveNode()) {
+        const Identifier& ident = static_cast<ResolveNode*>(m_lexpr)->identifier();
+        lambdaEmitResolveVariable(ident);
         return;
     }
+
+    if (m_lexpr->isAssignResolveNode()) {
+        const Identifier& ident = static_cast<AssignResolveNode*>(m_lexpr)->identifier();
+        lambdaEmitResolveVariable(ident);
+        return;
+    }
+
     if (m_lexpr->isDotAccessorNode()) {
         DotAccessorNode* assignNode = static_cast<DotAccessorNode*>(m_lexpr);
@@ -2631 +2643 @@
 void ForInNode::emitMultiLoopBytecode(BytecodeGenerator& generator, RegisterID* dst)
 {
-    if (!m_lexpr->isAssignmentLocation()) {
+    if (!m_lexpr->isAssignResolveNode() && !m_lexpr->isAssignmentLocation()) {
         emitThrowReferenceError(generator, ASCIILiteral("Left side of for-in statement is not a reference."));
         return;
@@ -2642 +2654 @@
 
     generator.emitDebugHook(WillExecuteStatement, firstLine(), startOffset(), lineStartOffset());
+
+    if (m_lexpr->isAssignResolveNode())
+        generator.emitNode(generator.ignoredResult(), m_lexpr);
 
     RefPtr<RegisterID> base = generator.newTemporary();
     RefPtr<RegisterID> length;
     RefPtr<RegisterID> enumerator;
+
     generator.emitNode(base.get(), m_expr);
     RefPtr<RegisterID> local = this->tryGetBoundLocal(generator);

trunk/Source/JavaScriptCore/parser/Nodes.h

@@ -169 +169 @@
         virtual bool isAssignmentLocation() const { return isLocation(); }
         virtual bool isResolveNode() const { return false; }
+        virtual bool isAssignResolveNode() const { return false; }
         virtual bool isBracketAccessorNode() const { return false; }
         virtual bool isDotAccessorNode() const { return false; }
@@ -1218 +1219 @@
     public:
         AssignResolveNode(const JSTokenLocation&, const Identifier&, ExpressionNode* right, AssignmentContext);
+        bool isAssignResolveNode() const override { return true; }
+        const Identifier& identifier() const { return m_ident; }
 
     private:

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1204 +1204 @@
         if (isOfEnumeration)
             result = context.createForOfLoop(location, forInTarget, expr, statement, declsStart, inLocation, exprEnd, startLine, endLine, *lexicalVariables);
-        else
-            result = context.createForInLoop(location, forInTarget, expr, statement, declsStart, inLocation, exprEnd, startLine, endLine, *lexicalVariables);
+        else {
+            if (isVarDeclaraton && forInInitializer)
+                result = context.createForInLoop(location, decls, expr, statement, declsStart, inLocation, exprEnd, startLine, endLine, *lexicalVariables);
+            else
+                result = context.createForInLoop(location, forInTarget, expr, statement, declsStart, inLocation, exprEnd, startLine, endLine, *lexicalVariables);
+        }
         popLexicalScopeIfNecessary();
         return result;