From dc458111ba660e75f85843a62f1a7f0c2bc14921 Mon Sep 17 00:00:00 2001 From: Zoltan Herczeg Date: Fri, 8 Nov 2019 14:03:19 +0100 Subject: [PATCH] Local functions should not be created globally. (#3290) Fixes #3286. JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com --- jerry-core/parser/js/js-scanner-util.c | 3 +++ tests/jerry/es2015/let11.js | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 tests/jerry/es2015/let11.js diff --git a/jerry-core/parser/js/js-scanner-util.c b/jerry-core/parser/js/js-scanner-util.c index 1a5a1a70f..10960ca11 100644 --- a/jerry-core/parser/js/js-scanner-util.c +++ b/jerry-core/parser/js/js-scanner-util.c @@ -1789,6 +1789,9 @@ scanner_create_variables (parser_context_t *context_p, /**< context */ if (type != SCANNER_STREAM_TYPE_ARG_FUNC) { if (func_init_opcode == CBC_INIT_LOCAL +#if ENABLED (JERRY_ES2015) + && type != SCANNER_STREAM_TYPE_FUNC_LOCAL +#endif /* ENABLED (JERRY_ES2015) */ && (option_flags & SCANNER_CREATE_VARS_IS_EVAL)) { func_init_opcode = CBC_CREATE_VAR_FUNC_EVAL; diff --git a/tests/jerry/es2015/let11.js b/tests/jerry/es2015/let11.js new file mode 100644 index 000000000..163d185fb --- /dev/null +++ b/tests/jerry/es2015/let11.js @@ -0,0 +1,18 @@ +/* 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. + */ + +let b = 5; +eval('function b() { return 8; }; assert(b() === 8);'); +assert(b === 5);