Changeset 233855 in webkit for trunk/Source/JavaScriptCore/parser/Parser.cpp

Timestamp:

Jul 16, 2018, 11:49:22 AM (7 years ago)

Author:

Yusuke Suzuki

Message:

[JSC] Generator and AsyncGeneratorMethod's prototype is incorrect
​https://bugs.webkit.org/show_bug.cgi?id=187585

Reviewed by Darin Adler.

JSTests:

• stress/default-proto-for-async-generator.js: Added.

(shouldBe):
(async.asyncGenerator):

• stress/default-proto-for-generator.js: Added.

(shouldBe):
(generator):

• stress/prototype-for-async-generator.js: Added.

(shouldBe):
(async.asyncGenerator):
(A.prototype.async.asyncGenerator):
(A):

• test262/expectations.yaml:

Source/JavaScriptCore:

This patch fixes Generator and AsyncGenerator's prototype issues.

1. Generator's default prototype is incorrect when generator.prototype = null is performed.

We fix this by changing JSFunction::prototypeForConstruction.

2. AsyncGeneratorMethod is not handled. We change the name isAsyncGeneratorFunctionParseMode

to isAsyncGeneratorWrapperParseMode since it is aligned to Generator's code. And use it well
to fix prototype issues for AsyncGeneratorMethod.

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::emitPutAsyncGeneratorFields):
(JSC::BytecodeGenerator::emitNewFunction):

• bytecompiler/NodesCodegen.cpp:

(JSC::FunctionNode::emitBytecode):

• parser/ASTBuilder.h:

(JSC::ASTBuilder::createFunctionMetadata):

• parser/Parser.cpp:

(JSC::getAsynFunctionBodyParseMode):
(JSC::Parser<LexerType>::parseInner):
(JSC::Parser<LexerType>::parseAsyncGeneratorFunctionSourceElements):

• parser/ParserModes.h:

(JSC::isAsyncGeneratorParseMode):
(JSC::isAsyncGeneratorWrapperParseMode):
(JSC::isAsyncGeneratorFunctionParseMode): Deleted.

• runtime/FunctionExecutable.h:
• runtime/JSFunction.cpp:

(JSC::JSFunction::prototypeForConstruction):
(JSC::JSFunction::getOwnPropertySlot):

File:

• trunk/Source/JavaScriptCore/parser/Parser.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -91 +91 @@
 ALWAYS_INLINE static SourceParseMode getAsynFunctionBodyParseMode(SourceParseMode parseMode)
 {
-    if (isAsyncGeneratorFunctionParseMode(parseMode))
+    if (isAsyncGeneratorWrapperParseMode(parseMode))
         return SourceParseMode::AsyncGeneratorBodyMode;
 
@@ -238 +238 @@
         else if (isGeneratorWrapperParseMode(parseMode))
             sourceElements = parseGeneratorFunctionSourceElements(context, calleeName, CheckForStrictMode);
-        else if (isAsyncGeneratorFunctionParseMode(parseMode))
+        else if (isAsyncGeneratorWrapperParseMode(parseMode))
             sourceElements = parseAsyncGeneratorFunctionSourceElements(context, parseMode, isArrowFunctionBodyExpression, CheckForStrictMode);
         else
@@ -567 +567 @@
 template <class TreeBuilder> TreeSourceElements Parser<LexerType>::parseAsyncGeneratorFunctionSourceElements(TreeBuilder& context, SourceParseMode parseMode, bool isArrowFunctionBodyExpression, SourceElementsMode mode)
 {
-    ASSERT_UNUSED(parseMode, isAsyncGeneratorFunctionParseMode(parseMode));
+    ASSERT_UNUSED(parseMode, isAsyncGeneratorWrapperParseMode(parseMode));
     auto sourceElements = context.createSourceElements();