Changeset 271432 in webkit

Timestamp:

Jan 12, 2021, 11:04:32 PM (6 years ago)

Author:

Ross Kirsling

Message:

[JSC] Class name 'await' is valid in sync context
​https://bugs.webkit.org/show_bug.cgi?id=220575

Reviewed by Yusuke Suzuki.

JSTests:

• test262/expectations.yaml:

Mark four test cases as passing.

Source/JavaScriptCore:

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseClass):
Check for valid 'await'.

• parser/Parser.h:

(JSC::Parser::isDisallowedIdentifierAwait):
Fix mistake -- we care if the containing function is async, we don't care about being *at* function scope.

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/test262/expectations.yaml (modified) (2 diffs)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.cpp (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.h (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2021-01-12  Ross Kirsling  <ross.kirsling@sony.com>
+
+        [JSC] Class name 'await' is valid in sync context
+        https://bugs.webkit.org/show_bug.cgi?id=220575
+
+        Reviewed by Yusuke Suzuki.
+
+        * test262/expectations.yaml:
+        Mark four test cases as passing.
+
 2021-01-12  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/JSTests/test262/expectations.yaml

@@ -1482 +1482 @@
   default: "SyntaxError: Unexpected escaped characters in keyword token: 'aw\\u0061it'"
   strict mode: "SyntaxError: Unexpected escaped characters in keyword token: 'aw\\u0061it'"
-test/language/expressions/class/class-name-ident-await.js:
-  default: "SyntaxError: Unexpected identifier 'await'. Expected opening '{' at the start of a class body."
-  strict mode: "SyntaxError: Unexpected identifier 'await'. Expected opening '{' at the start of a class body."
 test/language/expressions/class/elements/arrow-body-direct-eval-err-contains-arguments.js:
   default: 'Test262Error: Expected a SyntaxError but got a ReferenceError'
@@ -1737 +1734 @@
   default: "SyntaxError: Unexpected escaped characters in keyword token: 'aw\\u0061it'"
   strict mode: "SyntaxError: Unexpected escaped characters in keyword token: 'aw\\u0061it'"
-test/language/statements/class/class-name-ident-await.js:
-  default: "SyntaxError: Unexpected identifier 'await'"
-  strict mode: "SyntaxError: Unexpected identifier 'await'"
 test/language/statements/class/elements/arrow-body-direct-eval-err-contains-arguments.js:
   default: 'Test262Error: Expected a SyntaxError but got a ReferenceError'

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-01-12  Ross Kirsling  <ross.kirsling@sony.com>
+
+        [JSC] Class name 'await' is valid in sync context
+        https://bugs.webkit.org/show_bug.cgi?id=220575
+
+        Reviewed by Yusuke Suzuki.
+
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parseClass):
+        Check for valid 'await'.
+
+        * parser/Parser.h:
+        (JSC::Parser::isDisallowedIdentifierAwait):
+        Fix mistake -- we care if the containing function is async, we don't care about being *at* function scope.
+
 2021-01-12  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -2861 +2861 @@
     ASSERT_WITH_MESSAGE(requirements != FunctionNameRequirements::Unnamed, "Currently, there is no caller that uses FunctionNameRequirements::Unnamed for class syntax.");
     ASSERT_WITH_MESSAGE(!(requirements == FunctionNameRequirements::None && !info.className), "When specifying FunctionNameRequirements::None, we need to initialize info.className with the default value in the caller side.");
-    if (match(IDENT)) {
+    if (match(IDENT) || (match(AWAIT) && !isDisallowedIdentifierAwait(m_token))) {
         info.className = m_token.m_data.ident;
         next();

trunk/Source/JavaScriptCore/parser/Parser.h

@@ -1843 +1843 @@
     bool isDisallowedIdentifierAwait(const JSToken& token)
     {
-        return token.m_type == AWAIT && (!m_parserState.allowAwait || currentScope()->isAsyncFunctionBoundary() || m_scriptMode == JSParserScriptMode::Module);
+        return token.m_type == AWAIT && (!m_parserState.allowAwait || currentScope()->isAsyncFunction() || m_scriptMode == JSParserScriptMode::Module);
     }