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

Fix lexical declaration check for let variables (#4529)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik
2021-02-04 13:07:38 +01:00
committed by GitHub
parent a1b682a83d
commit 3bb67397a0
5 changed files with 204 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/vm/opcodes.c
+67
View File
@@ -1745,6 +1745,73 @@ opfunc_copy_data_properties (ecma_value_t target_object, /**< target object */
return result;
} /* opfunc_copy_data_properties */
/**
* Check whether the current lexical scope has restricted binding declaration with the given name
*
* Steps are include ES11: 8.1.1.4.14 HasRestrictedGlobalProperty abstract operation
*
* @return ECMA_VALUE_ERROR - if the operation fails
* ECMA_VALUE_TRUE - if it has restricted property binding
* ECMA_VALUE_FALSE - otherwise
*/
ecma_value_t
opfunc_lexical_scope_has_restricted_binding (vm_frame_ctx_t *frame_ctx_p, /**< frame context */
ecma_string_t *name_p) /**< binding name */
{
JERRY_ASSERT (ecma_get_lex_env_type (frame_ctx_p->lex_env_p) == ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE);
#if ENABLED (JERRY_BUILTIN_REALMS)
JERRY_ASSERT (frame_ctx_p->this_binding == JERRY_CONTEXT (global_object_p)->this_binding);
#else /* !ENABLED (JERRY_BUILTIN_REALMS) */
JERRY_ASSERT (frame_ctx_p->this_binding == ecma_builtin_get_global ());
#endif /* ENABLED (JERRY_BUILTIN_REALMS) */
ecma_object_t *lex_env_p = frame_ctx_p->lex_env_p;
ecma_property_t *binding_p = ecma_find_named_property (lex_env_p, name_p);
if (binding_p != NULL)
{
return ECMA_VALUE_TRUE;
}
#if ENABLED (JERRY_BUILTIN_REALMS)
ecma_object_t *const global_scope_p = ecma_get_global_scope ((ecma_object_t *) JERRY_CONTEXT (global_object_p));
#else /* !ENABLED (JERRY_BUILTIN_REALMS) */
ecma_object_t *const global_scope_p = ecma_get_global_scope (global_obj_p);
#endif /* ENABLED (JERRY_BUILTIN_REALMS) */
if (global_scope_p != lex_env_p)
{
return ECMA_VALUE_FALSE;
}
ecma_object_t *global_obj_p = ecma_get_object_from_value (frame_ctx_p->this_binding);
#if ENABLED (JERRY_BUILTIN_PROXY)
if (ECMA_OBJECT_IS_PROXY (global_obj_p))
{
ecma_property_descriptor_t prop_desc;
ecma_value_t status = ecma_proxy_object_get_own_property_descriptor (global_obj_p, name_p, &prop_desc);
if (ecma_is_value_true (status))
{
status = ecma_make_boolean_value ((prop_desc.flags & ECMA_PROP_IS_CONFIGURABLE) == 0);
ecma_free_property_descriptor (&prop_desc);
}
return status;
}
#endif /* ENABLED (JERRY_BUILTIN_PROXY) */
ecma_property_t property = ecma_op_object_get_own_property (global_obj_p,
name_p,
NULL,
ECMA_PROPERTY_GET_NO_OPTIONS);
return ecma_make_boolean_value ((property != ECMA_PROPERTY_TYPE_NOT_FOUND
&& !ecma_is_property_configurable (property)));
} /* opfunc_lexical_scope_has_restricted_binding */
#endif /* ENABLED (JERRY_ESNEXT) */
/**
jerry-core/vm/opcodes.h
+2
View File
@@ -178,6 +178,8 @@ opfunc_assign_super_reference (ecma_value_t **vm_stack_top_p, vm_frame_ctx_t *fr
ecma_value_t
opfunc_copy_data_properties (ecma_value_t target_object, ecma_value_t source_object, ecma_value_t filter_array);
ecma_value_t
opfunc_lexical_scope_has_restricted_binding (vm_frame_ctx_t *vm_frame_ctx_p, ecma_string_t *name_p);
#endif /* ENABLED (JERRY_ESNEXT) */
/**
jerry-core/vm/vm.c
+12 -9
View File
@@ -1651,20 +1651,23 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
ecma_string_t *literal_name_p = ecma_get_string_from_value (literal_start_p[literal_index]);
ecma_object_t *lex_env_p = frame_ctx_p->lex_env_p;
ecma_property_t *binding_p = NULL;
if (lex_env_p->type_flags_refs & ECMA_OBJECT_FLAG_BLOCK)
{
binding_p = ecma_find_named_property (lex_env_p, literal_name_p);
result = opfunc_lexical_scope_has_restricted_binding (frame_ctx_p, literal_name_p);
JERRY_ASSERT (lex_env_p->u2.outer_reference_cp != JMEM_CP_NULL);
lex_env_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, lex_env_p->u2.outer_reference_cp);
}
if (!ecma_is_value_false (result))
{
if (ecma_is_value_true (result))
{
result = ecma_raise_syntax_error (ECMA_ERR_MSG ("Local variable is redeclared"));
}
if (binding_p != NULL)
{
result = ecma_raise_syntax_error (ECMA_ERR_MSG ("Local variable is redeclared"));
goto error;
JERRY_ASSERT (ECMA_IS_VALUE_ERROR (result));
goto error;
}
continue;
}
result = ecma_op_has_binding (lex_env_p, literal_name_p);