Changeset 217578 in webkit

Timestamp:

May 30, 2017 2:35:49 PM (7 years ago)

Author:

gskachkov@gmail.com

Message:

Prevent async methods named 'function' in Object literal
​https://bugs.webkit.org/show_bug.cgi?id=172660

Reviewed by Saam Barati.

JSTests:

• stress/async-await-syntax.js:

(testTopLevelAsyncAwaitSyntaxSloppyMode.testSyntaxError):

Source/JavaScriptCore:

Prevent async method named 'function' in object.
​https://github.com/tc39/ecma262/pull/884

• parser/Parser.cpp:

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

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/async-await-syntax.js (modified) (2 diffs)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2017-05-30  Oleksandr Skachkov  <gskachkov@gmail.com>
+
+        Prevent async methods named 'function' in Object literal
+        https://bugs.webkit.org/show_bug.cgi?id=172660
+
+        Reviewed by Saam Barati.
+
+        * stress/async-await-syntax.js:
+        (testTopLevelAsyncAwaitSyntaxSloppyMode.testSyntaxError):
+
 2017-05-30  Oleksandr Skachkov  <gskachkov@gmail.com>
 

trunk/JSTests/stress/async-await-syntax.js

@@ -174 +174 @@
     testSyntaxError(`var O = { async asyncGeneratorMethod*() {} };`);
 
+    testSyntaxError(`var O = { async function() {} };`);
+
     testSyntaxError(`var asyncFn = async function(x = await 1) { return x; }`);
     testSyntaxError(`async function f(x = await 1) { return x; }`);
@@ -253 +255 @@
     testSyntaxError(`"use strict"; var O = { async asyncGeneratorMethod*() {} };`);
 
+    testSyntaxError(`"use strict"; var O = { async function() {} };`);
+
     testSyntaxError(`"use strict"; var asyncFn = async function(x = await 1) { return x; }`);
     testSyntaxError(`"use strict"; async function f(x = await 1) { return x; }`);

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-05-30  Oleksandr Skachkov  <gskachkov@gmail.com>
+
+        Prevent async methods named 'function' in Object literal
+        https://bugs.webkit.org/show_bug.cgi?id=172660
+
+        Reviewed by Saam Barati.
+
+        Prevent async method named 'function' in object.
+        https://github.com/tc39/ecma262/pull/884
+
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parsePropertyMethod):
+
 2017-05-30  Oleksandr Skachkov  <gskachkov@gmail.com>
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -3809 +3809 @@
     ParserFunctionInfo<TreeBuilder> methodInfo;
     methodInfo.name = methodName;
+    semanticFailIfTrue(isAsyncMethod && *methodName == m_vm->propertyNames->functionKeyword, "Cannot declare an async method named 'function'");
     SourceParseMode parseMode = isGenerator ? SourceParseMode::GeneratorWrapperMethodMode : isAsyncMethod ? SourceParseMode::AsyncMethodMode : SourceParseMode::MethodMode;
     failIfFalse((parseFunctionInfo(context, FunctionNameRequirements::Unnamed, parseMode, false, ConstructorKind::None, SuperBinding::Needed, methodStart, methodInfo, FunctionDefinitionType::Method)), "Cannot parse this method");