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

Unified Diff: src/parsing/parser-base.h

Issue 2188153002: Speed up parsing w/ grammar shortcut. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Review feedback. Created 4 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/parsing/parser-base.h
diff --git a/src/parsing/parser-base.h b/src/parsing/parser-base.h
index edd2c518fd0a4bdee29f8a9854c23e77102fb17b..4fd97b200840cf0ecd35233963af3c59123be7be 100644
--- a/src/parsing/parser-base.h
+++ b/src/parsing/parser-base.h
@@ -1127,6 +1127,7 @@ class ParserBase : public Traits {
int formals_end_pos, bool* ok);
bool IsNextLetKeyword();
+ bool IsTrivialExpression();
// Checks if the expression is a valid reference expression (e.g., on the
// left-hand side of assignments). Although ruled out by ECMA as early errors,
@@ -1553,8 +1554,6 @@ ParserBase<Traits>::ParsePrimaryExpression(ExpressionClassifier* classifier,
case Token::NULL_LITERAL:
case Token::TRUE_LITERAL:
case Token::FALSE_LITERAL:
- BindingPatternUnexpectedToken(classifier);
- return this->ExpressionFromLiteral(Next(), beg_pos, scanner(), factory());
case Token::SMI:
case Token::NUMBER:
BindingPatternUnexpectedToken(classifier);
@@ -2307,8 +2306,17 @@ ParserBase<Traits>::ParseAssignmentExpression(bool accept_IN,
if (!is_async && !parenthesized_formals) {
ArrowFormalParametersUnexpectedToken(&arrow_formals_classifier);
}
- ExpressionT expression = this->ParseConditionalExpression(
- accept_IN, &arrow_formals_classifier, CHECK_OK);
+
+ // Parse a simple, faster sub-grammar (primary expression) if it's evident
+ // that we have only a trivial expression to parse.
+ ExpressionT expression;
+ if (IsTrivialExpression()) {
+ expression = this->ParsePrimaryExpression(&arrow_formals_classifier,
+ &is_async, CHECK_OK);
+ } else {
+ expression = this->ParseConditionalExpression(
+ accept_IN, &arrow_formals_classifier, CHECK_OK);
+ }
if (is_async && peek_any_identifier() && PeekAhead() == Token::ARROW) {
// async Identifier => AsyncConciseBody
@@ -3365,6 +3373,24 @@ bool ParserBase<Traits>::IsNextLetKeyword() {
}
template <class Traits>
+bool ParserBase<Traits>::IsTrivialExpression() {
+ Token::Value peek_token = peek();
+ if (peek_token == Token::SMI || peek_token == Token::NUMBER ||
+ peek_token == Token::NULL_LITERAL || peek_token == Token::TRUE_LITERAL ||
+ peek_token == Token::FALSE_LITERAL || peek_token == Token::STRING ||
+ peek_token == Token::IDENTIFIER || peek_token == Token::THIS) {
+ // PeekAhead() is expensive & may not always be called, so we only call it
+ // after checking peek().
+ Token::Value peek_ahead = PeekAhead();
+ if (peek_ahead == Token::COMMA || peek_ahead == Token::RPAREN ||
+ peek_ahead == Token::SEMICOLON || peek_ahead == Token::RBRACK) {
+ return true;
+ }
+ }
+ return false;
+}
+
+template <class Traits>
typename ParserBase<Traits>::ExpressionT
ParserBase<Traits>::ParseArrowFunctionLiteral(
bool accept_IN, const FormalParametersT& formal_parameters, bool is_async,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698