Changeset 270487 in webkit

Timestamp:

Dec 6, 2020 12:41:45 PM (20 months ago)

Author:

ysuzuki@apple.com

Message:

[JSC] get / set for object literal and class should not be escaped
​https://bugs.webkit.org/show_bug.cgi?id=219576

Reviewed by Alexey Shvayka.

JSTests:

• stress/escaped-getter-setter-in-class.js: Added.

(testSyntaxError):
(testSyntaxError.String.raw.A.prototype.u0067.u0065.u0074.m):
(testSyntaxError.String.raw.A):
(testSyntaxError.String.raw.A.prototype.u0073.u0065.u0074.m):

• stress/escaped-getter-setter-in-object.js: Added.

(testSyntaxError):
(testSyntaxError.String.raw.u0067.u0065.u0074.m):
(testSyntaxError.String.raw.u0073.u0065.u0074.m):

• test262/expectations.yaml:

Source/JavaScriptCore:

"get" and "set" for getter and setter should not be escaped one.
Terminal symbols of the lexical grammars are shown in fixed width font [1],
and are to appear in a script exactly as written.

[1]: ​https://tc39.es/ecma262/#sec-method-definitions

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseClass):
(JSC::Parser<LexerType>::parseProperty):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/escaped-getter-setter-in-class.js (added)
• JSTests/stress/escaped-getter-setter-in-object.js (added)
• JSTests/test262/expectations.yaml (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.cpp (modified) (3 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2020-12-06  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] get / set for object literal and class should not be escaped
+        https://bugs.webkit.org/show_bug.cgi?id=219576
+
+        Reviewed by Alexey Shvayka.
+
+        * stress/escaped-getter-setter-in-class.js: Added.
+        (testSyntaxError):
+        (testSyntaxError.String.raw.A.prototype.u0067.u0065.u0074.m):
+        (testSyntaxError.String.raw.A):
+        (testSyntaxError.String.raw.A.prototype.u0073.u0065.u0074.m):
+        * stress/escaped-getter-setter-in-object.js: Added.
+        (testSyntaxError):
+        (testSyntaxError.String.raw.u0067.u0065.u0074.m):
+        (testSyntaxError.String.raw.u0073.u0065.u0074.m):
+        * test262/expectations.yaml:
+
 2020-12-05  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/JSTests/test262/expectations.yaml

@@ -1775 +1775 @@
 test/language/expressions/object/method-definition/async-gen-meth-eval-var-scope-syntax-err.js:
   default: 'Test262Error: Expected a SyntaxError to be thrown but no exception was thrown at all'
-test/language/expressions/object/method-definition/escaped-get-e.js:
-  default: 'Test262: This statement should not be evaluated.'
-  strict mode: 'Test262: This statement should not be evaluated.'
-test/language/expressions/object/method-definition/escaped-get-g.js:
-  default: 'Test262: This statement should not be evaluated.'
-  strict mode: 'Test262: This statement should not be evaluated.'
-test/language/expressions/object/method-definition/escaped-get-t.js:
-  default: 'Test262: This statement should not be evaluated.'
-  strict mode: 'Test262: This statement should not be evaluated.'
-test/language/expressions/object/method-definition/escaped-get.js:
-  default: 'Test262: This statement should not be evaluated.'
-  strict mode: 'Test262: This statement should not be evaluated.'
-test/language/expressions/object/method-definition/escaped-set-e.js:
-  default: 'Test262: This statement should not be evaluated.'
-  strict mode: 'Test262: This statement should not be evaluated.'
-test/language/expressions/object/method-definition/escaped-set-s.js:
-  default: 'Test262: This statement should not be evaluated.'
-  strict mode: 'Test262: This statement should not be evaluated.'
-test/language/expressions/object/method-definition/escaped-set-t.js:
-  default: 'Test262: This statement should not be evaluated.'
-  strict mode: 'Test262: This statement should not be evaluated.'
-test/language/expressions/object/method-definition/escaped-set.js:
-  default: 'Test262: This statement should not be evaluated.'
-  strict mode: 'Test262: This statement should not be evaluated.'
 test/language/expressions/object/method-definition/forbidden-ext/b2/gen-meth-forbidden-ext-indirect-access-own-prop-caller-get.js:
   default: 'TypeError: Function.caller used to retrieve generator body'

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-12-06  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] get / set for object literal and class should not be escaped
+        https://bugs.webkit.org/show_bug.cgi?id=219576
+
+        Reviewed by Alexey Shvayka.
+
+        "get" and "set" for getter and setter should not be escaped one.
+        Terminal symbols of the lexical grammars are shown in fixed width font [1],
+        and are to appear in a script exactly as written.
+
+        [1]: https://tc39.es/ecma262/#sec-method-definitions
+
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parseClass):
+        (JSC::Parser<LexerType>::parseProperty):
+
 2020-12-05  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -2949 +2949 @@
             }
             FALLTHROUGH;
-        case AWAIT:
+        case AWAIT: {
             ident = m_token.m_data.ident;
+            bool escaped = m_token.m_data.escaped;
             ASSERT(ident);
             next();
-            if (parseMode == SourceParseMode::MethodMode && (matchIdentifierOrKeyword() || match(STRING) || match(DOUBLE) || match(INTEGER) || match(BIGINT) || match(OPENBRACKET))) {
+            if (parseMode == SourceParseMode::MethodMode && !escaped && (matchIdentifierOrKeyword() || match(STRING) || match(DOUBLE) || match(INTEGER) || match(BIGINT) || match(OPENBRACKET))) {
                 isGetter = *ident == propertyNames.get;
                 isSetter = *ident == propertyNames.set;
             }
             break;
+        }
         case DOUBLE:
         case INTEGER:
@@ -4213 +4215 @@
 namedProperty:
         const Identifier* ident = m_token.m_data.ident;
+        bool escaped = m_token.m_data.escaped;
         unsigned getterOrSetterStartOffset = tokenStart();
         JSToken identToken = m_token;
 
-        if (wasIdent && !isGeneratorMethodParseMode(parseMode) && (*ident == m_vm.propertyNames->get || *ident == m_vm.propertyNames->set))
+        if (wasIdent && !isGeneratorMethodParseMode(parseMode) && (!escaped && (*ident == m_vm.propertyNames->get || *ident == m_vm.propertyNames->set)))
             nextExpectIdentifier(LexerFlags::IgnoreReservedWords);
         else
@@ -4253 +4256 @@
             classifyExpressionError(ErrorIndicatesPattern);
 
-        PropertyNode::Type type;
-        if (*ident == m_vm.propertyNames->get)
-            type = PropertyNode::Getter;
-        else if (*ident == m_vm.propertyNames->set)
-            type = PropertyNode::Setter;
-        else
+        Optional<PropertyNode::Type> type;
+        if (!escaped) {
+            if (*ident == m_vm.propertyNames->get)
+                type = PropertyNode::Getter;
+            else if (*ident == m_vm.propertyNames->set)
+                type = PropertyNode::Setter;
+        }
+        if (!type)
             failWithMessage("Expected a ':' following the property name '", ident->impl(), "'");
-        return parseGetterSetter(context, type, getterOrSetterStartOffset, ConstructorKind::None, ClassElementTag::No);
+        return parseGetterSetter(context, type.value(), getterOrSetterStartOffset, ConstructorKind::None, ClassElementTag::No);
     }
     case DOUBLE: