Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix parsing bugs in increment or decrement operations #1289

Merged
merged 2 commits into from
Dec 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/es-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,6 @@ jobs:
rm -rf $HOME/Escargot-cache/
- name: Run x64 release test
run: |
$RUNNER --arch=x86_64 --engine="$GITHUB_WORKSPACE/out/codecache/release/x64/escargot" web-tooling-benchmark
$RUNNER --arch=x86_64 --engine="$GITHUB_WORKSPACE/out/codecache/release/x64/escargot" web-tooling-benchmark
rm -rf $HOME/Escargot-cache/
- name: Handle error cases
Expand Down
19 changes: 10 additions & 9 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,18 @@
url = https://github.com/chromium/octane.git
ignore = untracked
[submodule "test/kangax"]
path = test/kangax
url = https://github.com/kangax/compat-table.git
path = test/kangax
url = https://github.com/kangax/compat-table.git
ignore = untracked
[submodule "third_party/googletest"]
path = third_party/googletest
url = https://github.com/google/googletest.git
path = third_party/googletest
url = https://github.com/google/googletest.git
ignore = untracked
[submodule "third_party/walrus"]
path = third_party/walrus
url = https://github.com/Samsung/walrus.git
ignore = untracked
path = third_party/walrus
url = https://github.com/Samsung/walrus.git
ignore = untracked
[submodule "test/web-tooling-benchmark"]
path = test/web-tooling-benchmark
url = https://github.com/v8/web-tooling-benchmark
path = test/web-tooling-benchmark
url = https://github.com/v8/web-tooling-benchmark
ignore = untracked
32 changes: 6 additions & 26 deletions src/parser/esprima_cpp/esprima.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2751,22 +2751,11 @@ class Parser {
this->nextToken(token);

exprNode = this->inheritCoverGrammar(builder, &Parser::parseUnaryExpression<ASTBuilder>);
if (exprNode->isLiteral() || exprNode->type() == ASTNodeType::ThisExpression) {
this->throwError(Messages::InvalidLHSInAssignment);
}
if (this->context->strict && exprNode->type() == Identifier && Scanner::isRestrictedWord(escargotContext, exprNode->asIdentifier()->name())) {
if (UNLIKELY(this->context->strict && exprNode->type() == Identifier && Scanner::isRestrictedWord(escargotContext, exprNode->asIdentifier()->name()))) {
this->throwError(Messages::StrictLHSPrefix);
}

if (!this->context->isAssignmentTarget && this->context->strict) {
this->throwError(Messages::InvalidLHSInAssignment);
}

auto exprNodeType = exprNode->type();
if (UNLIKELY(exprNodeType == ASTNodeType::MemberExpression && exprNode->asMemberExpression()->isOptional())) {
this->throwError(Messages::InvalidLHSInAssignment);
}
if (UNLIKELY(exprNodeType == ASTNodeType::ImportCall)) {
if (UNLIKELY((!this->context->isAssignmentTarget && (exprNode->type() != ASTNodeType::CallExpression || this->context->strict)) || (exprNode->type() == ObjectExpression))) {
this->throwError(Messages::InvalidLHSInAssignment);
}

Expand All @@ -2783,20 +2772,11 @@ class Parser {
exprNode = this->inheritCoverGrammar(builder, &Parser::parseLeftHandSideExpressionAllowCall<ASTBuilder>);
if (!this->hasLineTerminator && this->lookahead.type == Token::PunctuatorToken && (this->match(PlusPlus) || this->match(MinusMinus))) {
bool isPlus = this->match(PlusPlus);
if (exprNode->isLiteral() || exprNode->type() == ASTNodeType::ThisExpression) {
this->throwError(Messages::InvalidLHSInAssignment);
}
if (this->context->strict && exprNode->isIdentifier() && Scanner::isRestrictedWord(escargotContext, exprNode->asIdentifier()->name())) {
if (UNLIKELY(this->context->strict && exprNode->isIdentifier() && Scanner::isRestrictedWord(escargotContext, exprNode->asIdentifier()->name()))) {
this->throwError(Messages::StrictLHSPostfix);
}
if (!this->context->isAssignmentTarget && this->context->strict) {
this->throwError(Messages::InvalidLHSInAssignment);
}
auto exprNodeType = exprNode->type();
if (UNLIKELY(exprNodeType == ASTNodeType::MemberExpression && exprNode->asMemberExpression()->isOptional())) {
this->throwError(Messages::InvalidLHSInAssignment);
}
if (UNLIKELY(exprNodeType == ASTNodeType::ImportCall)) {

if (UNLIKELY((!this->context->isAssignmentTarget && (exprNode->type() != ASTNodeType::CallExpression || this->context->strict)) || (exprNode->type() == ObjectExpression))) {
this->throwError(Messages::InvalidLHSInAssignment);
}

Expand Down Expand Up @@ -4362,7 +4342,7 @@ class Parser {
init = nullptr;
type = statementTypeForIn;
} else if (this->lookahead.type == Token::IdentifierToken && this->lookahead.equalsToKeywordNoEscape(OfKeyword)) {
if (!this->context->isAssignmentTarget || (initNodeType >= ASTNodeType::AssignmentExpression && initNodeType <= ASTNodeType::AssignmentExpressionSimple)) {
if (UNLIKELY(!this->context->isAssignmentTarget || (initNodeType >= ASTNodeType::AssignmentExpression && initNodeType <= ASTNodeType::AssignmentExpressionSimple))) {
this->throwError(Messages::InvalidLHSInForLoop);
}

Expand Down
2 changes: 1 addition & 1 deletion test/vendortest