YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix scope stack lookup for literal indices (#4067)

Browse Source 
This patch fixes #4051.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik
2020-07-28 10:55:13 +02:00
committed by GitHub
parent 4d5757d1b1
commit 2e2b0dafb0
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/js/js-scanner-util.c
+4 -2
View File
@@ -2540,7 +2540,8 @@ scanner_save_literal (parser_context_t *context_p, /**< context */
JERRY_ASSERT (scope_stack_p > context_p->scope_stack_p); JERRY_ASSERT (scope_stack_p > context_p->scope_stack_p);
scope_stack_p--; scope_stack_p--;
} }
while (literal_index != (scope_stack_p->map_to & PARSER_SCOPE_STACK_REGISTER_MASK)); while (scope_stack_p->map_from == PARSER_SCOPE_STACK_FUNC
|| literal_index != (scope_stack_p->map_to & PARSER_SCOPE_STACK_REGISTER_MASK));
literal_index = scope_stack_p->map_from; literal_index = scope_stack_p->map_from;
PARSER_GET_LITERAL (literal_index)->status_flags |= LEXER_FLAG_USED; PARSER_GET_LITERAL (literal_index)->status_flags |= LEXER_FLAG_USED;
@@ -2574,7 +2575,8 @@ scanner_literal_is_const_reg (parser_context_t *context_p, /**< context */
JERRY_ASSERT (scope_stack_p > context_p->scope_stack_p); JERRY_ASSERT (scope_stack_p > context_p->scope_stack_p);
scope_stack_p--; scope_stack_p--;
} }
while (literal_index != (scope_stack_p->map_to & PARSER_SCOPE_STACK_REGISTER_MASK)); while (scope_stack_p->map_from == PARSER_SCOPE_STACK_FUNC
|| literal_index != (scope_stack_p->map_to & PARSER_SCOPE_STACK_REGISTER_MASK));
return (scope_stack_p->map_to & PARSER_SCOPE_STACK_IS_CONST_REG) != 0; return (scope_stack_p->map_to & PARSER_SCOPE_STACK_IS_CONST_REG) != 0;
} /* scanner_literal_is_const_reg */ } /* scanner_literal_is_const_reg */
tests/jerry/es.next/regression-test-issue-4051.js
+22
View File
@@ -0,0 +1,22 @@
// 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.
function foo() {
for (var i = 0; i < 3; i++) {
const N = class { };
function bar(a0) { }
assert(N.name === 'N');
}
}
foo();