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

Fix arguments object detection in non-complex param list (#4867)

Browse Source 
This patch is the followup of #4849.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik robert.fancsik@h-lab.eu
This commit is contained in:
Robert Fancsik
2021-12-15 11:35:27 +01:00
committed by GitHub
parent dfc001d373
commit ce5c8492b8
2 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/js/js-scanner-util.c
+29 -30
View File
@@ -1237,45 +1237,41 @@ scanner_filter_arguments (parser_context_t *context_p, /**< context */
JERRY_ASSERT (SCANNER_LITERAL_POOL_MAY_HAVE_ARGUMENTS (literal_pool_p->status_flags)); JERRY_ASSERT (SCANNER_LITERAL_POOL_MAY_HAVE_ARGUMENTS (literal_pool_p->status_flags));
if (can_eval) if (JERRY_UNLIKELY (can_eval))
{ {
if (prev_literal_pool_p != NULL) if (prev_literal_pool_p != NULL)
{ {
prev_literal_pool_p->status_flags |= SCANNER_LITERAL_POOL_CAN_EVAL; prev_literal_pool_p->status_flags |= SCANNER_LITERAL_POOL_CAN_EVAL;
} }
if (has_arguments) literal_pool_p->status_flags &= (uint16_t) ~SCANNER_LITERAL_POOL_CAN_EVAL;
{
/* Force the lexically stored arguments object creation */
literal_pool_p->status_flags |= (SCANNER_LITERAL_POOL_ARGUMENTS_IN_ARGS | SCANNER_LITERAL_POOL_NO_ARGUMENTS);
}
} }
else
literal_pool_p->status_flags &= (uint16_t) ~SCANNER_LITERAL_POOL_CAN_EVAL;
parser_list_iterator_init (&literal_pool_p->literal_pool, &literal_iterator);
while (true)
{ {
literal_p = (lexer_lit_location_t *) parser_list_iterator_next (&literal_iterator); parser_list_iterator_init (&literal_pool_p->literal_pool, &literal_iterator);
if (literal_p == NULL) while (true)
{ {
return; literal_p = (lexer_lit_location_t *) parser_list_iterator_next (&literal_iterator);
}
if (can_eval || (literal_p->type & SCANNER_LITERAL_EARLY_CREATE)) if (literal_p == NULL)
{ {
literal_p->type |= SCANNER_LITERAL_NO_REG | SCANNER_LITERAL_EARLY_CREATE; return;
} }
uint8_t type = literal_p->type; if (can_eval || (literal_p->type & SCANNER_LITERAL_EARLY_CREATE))
const uint8_t mask = {
(SCANNER_LITERAL_IS_ARG | SCANNER_LITERAL_IS_DESTRUCTURED_ARG | SCANNER_LITERAL_IS_ARROW_DESTRUCTURED_ARG); literal_p->type |= SCANNER_LITERAL_NO_REG | SCANNER_LITERAL_EARLY_CREATE;
}
if ((type & mask) != SCANNER_LITERAL_IS_ARG) uint8_t type = literal_p->type;
{ const uint8_t mask =
break; (SCANNER_LITERAL_IS_ARG | SCANNER_LITERAL_IS_DESTRUCTURED_ARG | SCANNER_LITERAL_IS_ARROW_DESTRUCTURED_ARG);
if ((type & mask) != SCANNER_LITERAL_IS_ARG)
{
break;
}
} }
} }
@@ -1309,10 +1305,7 @@ scanner_filter_arguments (parser_context_t *context_p, /**< context */
if (has_arguments && scanner_literal_is_arguments (literal_p)) if (has_arguments && scanner_literal_is_arguments (literal_p))
{ {
/* 'arguments' function argument existence should prevent the arguments object construction */ has_arguments = false;
new_literal_pool_p->status_flags =
(uint16_t) (new_literal_pool_p->status_flags
& ~(SCANNER_LITERAL_POOL_ARGUMENTS_IN_ARGS | SCANNER_LITERAL_POOL_NO_ARGUMENTS));
} }
if (type & (SCANNER_LITERAL_IS_DESTRUCTURED_ARG | SCANNER_LITERAL_IS_ARROW_DESTRUCTURED_ARG)) if (type & (SCANNER_LITERAL_IS_DESTRUCTURED_ARG | SCANNER_LITERAL_IS_ARROW_DESTRUCTURED_ARG))
@@ -1371,6 +1364,12 @@ scanner_filter_arguments (parser_context_t *context_p, /**< context */
} }
} }
if (has_arguments)
{
/* Force the lexically stored arguments object creation */
new_literal_pool_p->status_flags |= (SCANNER_LITERAL_POOL_ARGUMENTS_IN_ARGS | SCANNER_LITERAL_POOL_NO_ARGUMENTS);
}
new_literal_pool_p->prev_p = prev_literal_pool_p; new_literal_pool_p->prev_p = prev_literal_pool_p;
parser_list_free (&literal_pool_p->literal_pool); parser_list_free (&literal_pool_p->literal_pool);
tests/jerry/es.next/arguments.js
+5
View File
@@ -217,3 +217,8 @@ function f22 (arguments, [a = arguments]) {
assert(arguments === 3.1); assert(arguments === 3.1);
} }
f22(3.1, []); f22(3.1, []);
function f23(arguments, eval = () => eval()) {
assert(arguments === undefined);
}
f23(undefined);