Commit 690922c9 authored by littledan's avatar littledan Committed by Commit bot

[esnext] Fix super in async arrow functions

Ordinary arrow functions have 'undefined' in their frame's receiver.
Generators restore the receiver to the frame based on one passed in
when they are constructed in CreateJSGeneratorObject.

This patch makes async arrow functions pass in 'undefined' for their
receiver so that they have the same behavior as ordinary arrow
functions, which avoids the issue of encountering TDZ when calling
an async arrow function in a subclass constructor before a super
call has returned.

BUG=v8:4483

Review-Url: https://codereview.chromium.org/1976813002
Cr-Commit-Position: refs/heads/master@{#36264}
parent d08c0304
...@@ -4025,7 +4025,7 @@ void Parser::DesugarAsyncFunctionBody(const AstRawString* function_name, ...@@ -4025,7 +4025,7 @@ void Parser::DesugarAsyncFunctionBody(const AstRawString* function_name,
Expression* init_generator_variable = factory()->NewAssignment( Expression* init_generator_variable = factory()->NewAssignment(
Token::INIT, factory()->NewVariableProxy(temp), Token::INIT, factory()->NewVariableProxy(temp),
BuildCreateJSGeneratorObject(pos), RelocInfo::kNoPosition); BuildCreateJSGeneratorObject(pos, kind), RelocInfo::kNoPosition);
body->Add(factory()->NewExpressionStatement(init_generator_variable, body->Add(factory()->NewExpressionStatement(init_generator_variable,
RelocInfo::kNoPosition), RelocInfo::kNoPosition),
zone()); zone());
...@@ -4627,11 +4627,14 @@ Block* Parser::BuildRejectPromiseOnException(Block* block) { ...@@ -4627,11 +4627,14 @@ Block* Parser::BuildRejectPromiseOnException(Block* block) {
return block; return block;
} }
Expression* Parser::BuildCreateJSGeneratorObject(int pos) { Expression* Parser::BuildCreateJSGeneratorObject(int pos, FunctionKind kind) {
DCHECK_NOT_NULL(function_state_->generator_object_variable()); DCHECK_NOT_NULL(function_state_->generator_object_variable());
ZoneList<Expression*>* args = new (zone()) ZoneList<Expression*>(2, zone()); ZoneList<Expression*>* args = new (zone()) ZoneList<Expression*>(2, zone());
args->Add(factory()->NewThisFunction(pos), zone()); args->Add(factory()->NewThisFunction(pos), zone());
args->Add(ThisExpression(scope_, factory(), RelocInfo::kNoPosition), zone()); args->Add(IsArrowFunction(kind)
? GetLiteralUndefined(pos)
: ThisExpression(scope_, factory(), RelocInfo::kNoPosition),
zone());
return factory()->NewCallRuntime(Runtime::kCreateJSGeneratorObject, args, return factory()->NewCallRuntime(Runtime::kCreateJSGeneratorObject, args,
pos); pos);
} }
...@@ -4702,7 +4705,7 @@ ZoneList<Statement*>* Parser::ParseEagerFunctionBody( ...@@ -4702,7 +4705,7 @@ ZoneList<Statement*>* Parser::ParseEagerFunctionBody(
factory()->NewBlock(nullptr, 3, false, RelocInfo::kNoPosition); factory()->NewBlock(nullptr, 3, false, RelocInfo::kNoPosition);
{ {
Expression* allocation = BuildCreateJSGeneratorObject(pos); Expression* allocation = BuildCreateJSGeneratorObject(pos, kind);
VariableProxy* init_proxy = factory()->NewVariableProxy( VariableProxy* init_proxy = factory()->NewVariableProxy(
function_state_->generator_object_variable()); function_state_->generator_object_variable());
Assignment* assignment = factory()->NewAssignment( Assignment* assignment = factory()->NewAssignment(
......
...@@ -1096,7 +1096,7 @@ class Parser : public ParserBase<ParserTraits> { ...@@ -1096,7 +1096,7 @@ class Parser : public ParserBase<ParserTraits> {
friend class InitializerRewriter; friend class InitializerRewriter;
void RewriteParameterInitializer(Expression* expr, Scope* scope); void RewriteParameterInitializer(Expression* expr, Scope* scope);
Expression* BuildCreateJSGeneratorObject(int pos); Expression* BuildCreateJSGeneratorObject(int pos, FunctionKind kind);
Expression* BuildPromiseResolve(Expression* value, int pos); Expression* BuildPromiseResolve(Expression* value, int pos);
Expression* BuildPromiseReject(Expression* value, int pos); Expression* BuildPromiseReject(Expression* value, int pos);
......
...@@ -55,9 +55,6 @@ ...@@ -55,9 +55,6 @@
'es6/debug-promises/reject-with-undefined-reject': [FAIL], 'es6/debug-promises/reject-with-undefined-reject': [FAIL],
'es6/debug-promises/reject-with-invalid-reject': [FAIL], 'es6/debug-promises/reject-with-invalid-reject': [FAIL],
# TODO(caitp): fix super-call and super-property in async arrow functions
'harmony/async-arrow-lexical-super': [FAIL],
############################################################################## ##############################################################################
# TurboFan compiler failures. # TurboFan compiler failures.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment