Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Unified Diff: src/parsing/parser.cc

Issue 2405813002: Allow lazy parsing of functions nested in eager compiled functions (Closed)
Patch Set: Rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/parsing/parse-info.cc ('k') | src/parsing/parser-base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/parsing/parser.cc
diff --git a/src/parsing/parser.cc b/src/parsing/parser.cc
index 5f9597a33e65b97822509810c8d71342c75128d3..59cd0af9228cd0e1a816e76d6ca5af484be3816a 100644
--- a/src/parsing/parser.cc
+++ b/src/parsing/parser.cc
@@ -2626,10 +2626,11 @@ FunctionLiteral* Parser::ParseFunctionLiteral(
DCHECK_IMPLIES(mode() == PARSE_LAZILY, allow_lazy());
DCHECK_IMPLIES(mode() == PARSE_LAZILY, extension_ == nullptr);
+ bool can_preparse = mode() == PARSE_LAZILY &&
+ eager_compile_hint == FunctionLiteral::kShouldLazyCompile;
+
bool is_lazy_top_level_function =
- mode() == PARSE_LAZILY &&
- eager_compile_hint == FunctionLiteral::kShouldLazyCompile &&
- scope()->AllowsLazyParsingWithoutUnresolvedVariables();
+ can_preparse && scope()->AllowsLazyParsingWithoutUnresolvedVariables();
// Determine whether we can still lazy parse the inner function.
// The preconditions are:
@@ -2651,8 +2652,10 @@ FunctionLiteral* Parser::ParseFunctionLiteral(
// will migrate unresolved variable into a Scope in the main Zone.
// TODO(marja): Refactor parsing modes: simplify this.
bool use_temp_zone =
- allow_lazy() && function_type == FunctionLiteral::kDeclaration &&
- eager_compile_hint != FunctionLiteral::kShouldEagerCompile &&
+ (FLAG_lazy_inner_functions
+ ? can_preparse
+ : (allow_lazy() &&
+ eager_compile_hint == FunctionLiteral::kShouldLazyCompile)) &&
!(FLAG_validate_asm && scope()->IsAsmModule());
bool is_lazy_inner_function =
use_temp_zone && FLAG_lazy_inner_functions && !is_lazy_top_level_function;
@@ -3152,11 +3155,7 @@ ZoneList<Statement*>* Parser::ParseEagerFunctionBody(
const AstRawString* function_name, int pos,
const ParserFormalParameters& parameters, FunctionKind kind,
FunctionLiteral::FunctionType function_type, bool* ok) {
- // Everything inside an eagerly parsed function will be parsed eagerly (see
- // comment above). Lazy inner functions are handled separately and they won't
- // require the mode to be PARSE_LAZILY (see ParseFunctionLiteral).
- // TODO(marja): Refactor parsing modes: remove this.
- ParsingModeScope parsing_mode(this, PARSE_EAGERLY);
+ ParsingModeScope mode(this, allow_lazy() ? PARSE_LAZILY : PARSE_EAGERLY);
ZoneList<Statement*>* result = new(zone()) ZoneList<Statement*>(8, zone());
static const int kFunctionNameAssignmentIndex = 0;
« no previous file with comments | « src/parsing/parse-info.cc ('k') | src/parsing/parser-base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698