AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[parsing] Add helper for creating a hidden catch scope.

Browse Source 
The pattern of creating a hidden catch scope occurs several times, so
define a helper for it.

BUG=

Change-Id: I5831378341d86d41bfb015bd3e687183cc79ac20
Reviewed-on: https://chromium-review.googlesource.com/448559
Commit-Queue: Georg Neis <neis@chromium.org>
Reviewed-by: Adam Klein <adamk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#43574}
This commit is contained in:
Georg Neis 2017-03-02 15:14:43 +01:00 committed by Commit Bot
parent 7f68cbbffa
commit 4ae278bf67
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/parsing/parser.cc
View File

@ -2975,6 +2975,13 @@ Block* Parser::BuildParameterInitializationBlock(
return init_block;
}
Scope* Parser::NewHiddenCatchScopeWithParent(Scope* parent) {
Scope* catch_scope = NewScopeWithParent(parent, CATCH_SCOPE);
catch_scope->DeclareLocal(ast_value_factory()->dot_catch_string(), VAR);
catch_scope->set_is_hidden();
return catch_scope;
}
Block* Parser::BuildRejectPromiseOnException(Block* inner_block) {
// .promise = %AsyncFunctionPromiseCreate();
// try {
@ -3002,13 +3009,11 @@ Block* Parser::BuildRejectPromiseOnException(Block* inner_block) {
result->statements()->Add(set_promise, zone());
// catch (.catch) { return %RejectPromise(.promise, .catch), .promise }
Scope* catch_scope = NewScope(CATCH_SCOPE);
catch_scope->set_is_hidden();
Variable* catch_variable =
catch_scope->DeclareLocal(ast_value_factory()->dot_catch_string(), VAR);
Scope* catch_scope = NewHiddenCatchScopeWithParent(scope());
Expression* promise_reject = BuildRejectPromise(
factory()->NewVariableProxy(catch_variable), kNoSourcePosition);
factory()->NewVariableProxy(catch_scope->catch_variable()),
kNoSourcePosition);
Block* catch_block = IgnoreCompletion(
factory()->NewReturnStatement(promise_reject, kNoSourcePosition));
@ -4505,10 +4510,7 @@ Expression* Parser::RewriteYieldStar(Expression* generator,
Block* catch_block = factory()->NewBlock(nullptr, 1, false, nopos);
catch_block->statements()->Add(set_mode_throw, zone());
Scope* catch_scope = NewScope(CATCH_SCOPE);
catch_scope->set_is_hidden();
const AstRawString* name = ast_value_factory()->dot_catch_string();
catch_scope->DeclareLocal(name, VAR);
Scope* catch_scope = NewHiddenCatchScopeWithParent(scope());
try_catch = factory()->NewTryCatchStatementForDesugaring(
try_block, catch_scope, catch_block, nopos);
@ -4790,10 +4792,7 @@ void Parser::FinalizeIteratorUse(Scope* use_scope, Variable* completion,
// }
Statement* try_catch;
{
Scope* catch_scope = NewScopeWithParent(use_scope, CATCH_SCOPE);
Variable* catch_variable =
catch_scope->DeclareLocal(ast_value_factory()->dot_catch_string(), VAR);
catch_scope->set_is_hidden();
Scope* catch_scope = NewHiddenCatchScopeWithParent(use_scope);
Statement* rethrow;
// We use %ReThrow rather than the ordinary throw because we want to
@ -4802,7 +4801,8 @@ void Parser::FinalizeIteratorUse(Scope* use_scope, Variable* completion,
// message), rather than a TryCatchStatement.
{
auto args = new (zone()) ZoneList<Expression*>(1, zone());
args->Add(factory()->NewVariableProxy(catch_variable), zone());
args->Add(factory()->NewVariableProxy(catch_scope->catch_variable()),
zone());
rethrow = factory()->NewExpressionStatement(
factory()->NewCallRuntime(Runtime::kReThrow, args, nopos), nopos);
}
@ -4908,11 +4908,7 @@ void Parser::BuildIteratorCloseForCompletion(Scope* scope,
zone());
Block* catch_block = factory()->NewBlock(nullptr, 0, false, nopos);
Scope* catch_scope = NewScopeWithParent(scope, CATCH_SCOPE);
catch_scope->DeclareLocal(ast_value_factory()->dot_catch_string(), VAR);
catch_scope->set_is_hidden();
Scope* catch_scope = NewHiddenCatchScopeWithParent(scope);
try_call_return = factory()->NewTryCatchStatement(try_block, catch_scope,
catch_block, nopos);
}

2
src/parsing/parser.h
View File

@ -373,6 +373,8 @@ class V8_EXPORT_PRIVATE Parser : public NON_EXPORTED_BASE(ParserBase<Parser>) {
V8_INLINE Block* IgnoreCompletion(Statement* statement);
V8_INLINE Scope* NewHiddenCatchScopeWithParent(Scope* parent);
class PatternRewriter final : public AstVisitor<PatternRewriter> {
public:
static void DeclareAndInitializeVariables(