From 52debe85898f84a980d18ec09713d43cee3a9f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Tokodi?= Date: Thu, 1 Feb 2024 00:34:37 +0100 Subject: [PATCH] Fix arrow function parsing (#5093) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes #5085 JerryScript-DCO-1.0-Signed-off-by: Máté Tokodi mate.tokodi@szteszoftver.hu --- jerry-core/parser/js/js-parser.c | 8 +++++++- tests/jerry/fail/regression-test-issue-5085.js | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 tests/jerry/fail/regression-test-issue-5085.js diff --git a/jerry-core/parser/js/js-parser.c b/jerry-core/parser/js/js-parser.c index ecf7cd39e6..8f241b6a1a 100644 --- a/jerry-core/parser/js/js-parser.c +++ b/jerry-core/parser/js/js-parser.c @@ -2829,6 +2829,7 @@ parser_parse_arrow_function (parser_context_t *context_p, /**< context */ JERRY_ASSERT (context_p->token.type == LEXER_ARROW); lexer_next_token (context_p); + bool next_token_needed = false; if (context_p->token.type == LEXER_LEFT_BRACE) { @@ -2839,7 +2840,7 @@ parser_parse_arrow_function (parser_context_t *context_p, /**< context */ /* Unlike normal function, arrow functions consume their close brace. */ JERRY_ASSERT (context_p->token.type == LEXER_RIGHT_BRACE); - lexer_next_token (context_p); + next_token_needed = true; } else { @@ -2878,6 +2879,11 @@ parser_parse_arrow_function (parser_context_t *context_p, /**< context */ parser_restore_context (context_p, &saved_context); + if (next_token_needed) + { + lexer_next_token (context_p); + } + return compiled_code_p; } /* parser_parse_arrow_function */ diff --git a/tests/jerry/fail/regression-test-issue-5085.js b/tests/jerry/fail/regression-test-issue-5085.js new file mode 100644 index 0000000000..626aea0294 --- /dev/null +++ b/tests/jerry/fail/regression-test-issue-5085.js @@ -0,0 +1,17 @@ +// Copyright JS Foundation and other contributors, http://js.foundation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +async () => {} +await Symbol; +class B{}