[JSC] It should be possible create a label named let when parsing Statement in non...

https://bugs.webkit.org/show_bug.cgi?id=168684

Patch by Caio Lima <ticaiolima@gmail.com> on 2017-03-13
Reviewed by Saam Barati.

JSTests:

* ChakraCore/test/LetConst/DeclOutofBlock.baseline-jsc:

Source/JavaScriptCore:

This patch is fixing a Parser bug to allow define a label named
```let``` in sloppy mode when parsing a Statement.

* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseStatement):

LayoutTests:

* js/let-syntax-expected.txt:
* js/script-tests/let-syntax.js:
(shouldNotHaveSyntaxErrorSloopyOnly):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@213850 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JSTests/ChakraCore/test/LetConst/DeclOutofBlock.baseline-jsc b/JSTests/ChakraCore/test/LetConst/DeclOutofBlock.baseline-jsc
index 9e44e42..f97678c 100644 (file)
--- a/JSTests/ChakraCore/test/LetConst/DeclOutofBlock.baseline-jsc
+++ b/JSTests/ChakraCore/test/LetConst/DeclOutofBlock.baseline-jsc
@@ -1,6 +1,6 @@
-SyntaxError: Unexpected identifier 'b'. Parse error.
+SyntaxError: Unexpected identifier 'b'
 SyntaxError: Unexpected keyword 'const'
-SyntaxError: Unexpected identifier 'd'. Parse error.
-SyntaxError: Unexpected identifier 'd'. Parse error.
-SyntaxError: Unexpected identifier 'f'. Parse error.
+SyntaxError: Unexpected identifier 'd'
+SyntaxError: Unexpected identifier 'd'
+SyntaxError: Unexpected identifier 'f'
 success

diff --git a/JSTests/ChangeLog b/JSTests/ChangeLog
index 05bb010..f138ad9 100644 (file)
--- a/JSTests/ChangeLog
+++ b/JSTests/ChangeLog
@@ -1,3 +1,12 @@
+2017-03-13  Caio Lima  <ticaiolima@gmail.com>
+
+        [JSC] It should be possible create a label named let when parsing Statement in non strict mode
+        https://bugs.webkit.org/show_bug.cgi?id=168684
+
+        Reviewed by Saam Barati.
+
+        * ChakraCore/test/LetConst/DeclOutofBlock.baseline-jsc:
+
 2017-03-10  Saam Barati  <sbarati@apple.com>
 
         WebAssembly: Make more demos run

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c404b28..c31ceb2 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2017-03-13  Caio Lima  <ticaiolima@gmail.com>
+
+        [JSC] It should be possible create a label named let when parsing Statement in non strict mode
+        https://bugs.webkit.org/show_bug.cgi?id=168684
+
+        Reviewed by Saam Barati.
+
+        * js/let-syntax-expected.txt:
+        * js/script-tests/let-syntax.js:
+        (shouldNotHaveSyntaxErrorSloopyOnly):
+
 2017-03-13  Ryan Haddad  <ryanhaddad@apple.com>
 
         Rebaseline js/dom/global-constructors-attributes.html.

diff --git a/LayoutTests/js/let-syntax-expected.txt b/LayoutTests/js/let-syntax-expected.txt
index e7fafe9..a891cf0 100644 (file)
--- a/LayoutTests/js/let-syntax-expected.txt
+++ b/LayoutTests/js/let-syntax-expected.txt
@@ -69,6 +69,7 @@ PASS Does not have syntax error: 'let x = { get foo() { let foo = 20; } };'
 PASS Does not have syntax error: ''use strict'; let x = { get foo() { let foo = 20; } };'
 PASS Does not have syntax error: 'let x = { get foo() { class foo { } } };'
 PASS Does not have syntax error: ''use strict'; let x = { get foo() { class foo { } } };'
+PASS Does not have syntax error: 'let x; with ({}) let: y = 3;'
 SyntaxError: Unexpected keyword 'let'. Can't use 'let' as an identifier name for a LexicalDeclaration.
 SyntaxError: Unexpected keyword 'let'. Can't use 'let' as an identifier name for a LexicalDeclaration.
 PASS Has syntax error: 'let let;'
@@ -189,8 +190,8 @@ PASS Has syntax error: 'for (let i = 20, j = 40, i = 10; i < 10; i++) {}'
 SyntaxError: Cannot declare a let variable twice: 'i'.
 SyntaxError: Cannot declare a let variable twice: 'i'.
 PASS Has syntax error: ''use strict'; for (let i = 20, j = 40, i = 10; i < 10; i++) {}'
-SyntaxError: Unexpected identifier 'x'. Parse error.
-SyntaxError: Unexpected identifier 'x'. Parse error.
+SyntaxError: Unexpected identifier 'x'
+SyntaxError: Unexpected identifier 'x'
 PASS Has syntax error: 'let x = 20; if (truth()) let x = 40;'
 SyntaxError: Unexpected keyword 'let'
 SyntaxError: Unexpected keyword 'let'
@@ -387,6 +388,9 @@ PASS Has syntax error: 'function f() { function x(){}; class x{}; }'
 SyntaxError: Cannot declare a class twice: 'x'.
 SyntaxError: Cannot declare a class twice: 'x'.
 PASS Has syntax error: ''use strict'; function f() { function x(){}; class x{}; }'
+SyntaxError: Unexpected identifier 'y'
+SyntaxError: Unexpected identifier 'y'
+PASS Has syntax error: 'let x; with ({}) let y = 3;'
 ReferenceError: Can't find variable: let
 PASS Does not have syntax error: 'let;'
 SyntaxError: Unexpected token ';'. Expected a parameter pattern or a ')' in parameter list.
@@ -437,6 +441,10 @@ PASS Does not have syntax error: 'try { } catch(let) {}'
 SyntaxError: Cannot use the keyword 'let' as a catch parameter name.
 SyntaxError: Cannot use the keyword 'let' as a catch parameter name.
 PASS Has syntax error: ''use strict'; try { } catch(let) {}'
+PASS Does not have syntax error: 'let x; if (true) let: x = 3;'
+SyntaxError: Unexpected keyword 'let'
+SyntaxError: Unexpected keyword 'let'
+PASS Has syntax error: ''use strict'; let x; if (true) let: x = 3;'
 PASS successfullyParsed is true
 
 TEST COMPLETE

diff --git a/LayoutTests/js/script-tests/let-syntax.js b/LayoutTests/js/script-tests/let-syntax.js
index 711b02e..792eb91 100644 (file)
--- a/LayoutTests/js/script-tests/let-syntax.js
+++ b/LayoutTests/js/script-tests/let-syntax.js
@@ -31,6 +31,11 @@ function shouldHaveSyntaxError(str) {
     testPassed("Has syntax error: '" + str + "'");
 }
 
+function shouldHaveSyntaxErrorSloppyOnly(str) {
+    assert(hasSyntaxError(str));
+    assert(hasSyntaxError("function dummy() { " + str + " }"));
+    testPassed("Has syntax error: '" + str + "'");
+}
 
 function shouldNotHaveSyntaxError(str) {
     assert(!hasSyntaxError(str));
@@ -53,6 +58,13 @@ function shouldHaveSyntaxErrorStrictOnly(str)
     testPassed("Has syntax error: '" + str + "'");
 }
 
+function shouldNotHaveSyntaxErrorSloppyOnly(str)
+{
+    assert(!hasSyntaxError(str));
+    assert(!hasSyntaxError("(function dummy() { " + str + " })"));
+    testPassed("Does not have syntax error: '" + str + "'");
+}
+
 shouldNotHaveSyntaxError("let x = 20; if (truth()) { let x = 30; }");
 shouldNotHaveSyntaxError("let {x} = {x:20}; if (truth()) { let {x} = {x : 20}; }");
 shouldNotHaveSyntaxError("let {x} = {x:20}; if (truth()) { let {y: x} = {y : 20}; }");
@@ -86,6 +98,7 @@ shouldNotHaveSyntaxError("let x = { set foo(x) { class foo { } } };");
 shouldNotHaveSyntaxError("let x = { get foo() { const foo = 20; } };");
 shouldNotHaveSyntaxError("let x = { get foo() { let foo = 20; } };");
 shouldNotHaveSyntaxError("let x = { get foo() { class foo { } } };");
+shouldNotHaveSyntaxErrorSloppyOnly("let x; with ({}) let: y = 3;");
 
 shouldHaveSyntaxError("let let;");
 shouldHaveSyntaxError("const let;");
@@ -140,6 +153,7 @@ shouldHaveSyntaxError("function f() { class x{}; var {x} = 20; }");
 shouldHaveSyntaxError("function f() { class x{}; var [x] = 20; }");
 shouldHaveSyntaxError("function f() { class x{};  function x(){} }");
 shouldHaveSyntaxError("function f() { function x(){}; class x{}; }");
+shouldHaveSyntaxErrorSloppyOnly("let x; with ({}) let y = 3;");
 
 // Stay classy, ES6.
 shouldHaveSyntaxErrorStrictOnly("let;");
@@ -154,3 +168,4 @@ shouldHaveSyntaxErrorStrictOnly("let: for (v in {}) break;");
 shouldHaveSyntaxErrorStrictOnly("let: for (v in {}) break;");
 shouldHaveSyntaxErrorStrictOnly("let: for (var v = 0; false; ) {};");
 shouldHaveSyntaxErrorStrictOnly("try { } catch(let) {}");
+shouldHaveSyntaxErrorStrictOnly("let x; if (true) let: x = 3;");

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 88fa81d..4eafa8f 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2017-03-13  Caio Lima  <ticaiolima@gmail.com>
+
+        [JSC] It should be possible create a label named let when parsing Statement in non strict mode
+        https://bugs.webkit.org/show_bug.cgi?id=168684
+
+        Reviewed by Saam Barati.
+
+        This patch is fixing a Parser bug to allow define a label named
+        ```let``` in sloppy mode when parsing a Statement.
+
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parseStatement):
+
 2017-03-11  Filip Pizlo  <fpizlo@apple.com>
 
         Structure::willStoreValueSlow needs to keep the property table alive until the end

diff --git a/Source/JavaScriptCore/parser/Parser.cpp b/Source/JavaScriptCore/parser/Parser.cpp
index 2a9408b..8268639 100644 (file)
--- a/Source/JavaScriptCore/parser/Parser.cpp
+++ b/Source/JavaScriptCore/parser/Parser.cpp
@@ -1733,6 +1733,11 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseStatement(Tre
     case DEFAULT:
         // These tokens imply the end of a set of source elements
         return 0;
+    case LET: {
+        if (!strictMode())
+            goto identcase;
+        goto defaultCase;
+    }
     case ASYNC:
         if (maybeParseAsyncFunctionDeclarationStatement(context, result, parentAllowsFunctionDeclarationAsStatement))
             break;
@@ -1740,6 +1745,7 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseStatement(Tre
     case IDENT:
     case AWAIT:
     case YIELD: {
+        identcase:
         bool allowFunctionDeclarationAsStatement = false;
         result = parseExpressionOrLabelStatement(context, allowFunctionDeclarationAsStatement);
         shouldSetPauseLocation = !context.shouldSkipPauseLocation(result);
@@ -1752,6 +1758,7 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseStatement(Tre
         nonTrivialExpressionCount = m_parserState.nonTrivialExpressionCount;
         FALLTHROUGH;
     default:
+        defaultCase:
         TreeStatement exprStatement = parseExpressionStatement(context);
         if (directive && nonTrivialExpressionCount != m_parserState.nonTrivialExpressionCount)
             directive = nullptr;