archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues 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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 204 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
jerry-core/vm/opcodes.c
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) */
/**

2
jerry-core/vm/opcodes.h
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) */
/**

21
jerry-core/vm/vm.c
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);

8
tests/test262-esnext-excludelist.xml
View File

@ -8319,12 +8319,9 @@
<test id="language/statements/class/elements/same-line-async-gen-static-private-methods.js"><reason></reason></test>
<test id="language/statements/class/elements/syntax/valid/grammar-static-private-async-gen-meth-prototype.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-from-sync-iterator-continuation-abrupt-completion-get-constructor.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-func-decl-dstr-array-elem-init-simple-no-strict.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-func-decl-dstr-array-elem-put-prop-ref-user-err.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-func-decl-dstr-array-elem-put-unresolvable-strict.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-func-decl-dstr-array-elem-trlg-iter-elision-iter-nrml-close-null.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-func-decl-dstr-obj-id-init-simple-no-strict.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-func-decl-dstr-obj-id-simple-no-strict.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-func-dstr-const-ary-init-iter-get-err.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-func-dstr-const-ary-ptrn-elem-id-init-throws.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-func-dstr-const-ary-ptrn-elem-id-init-unresolvable.js"><reason></reason></test>
@ -8382,7 +8379,6 @@
<test id="language/statements/for-await-of/async-func-dstr-var-obj-ptrn-prop-id-get-value-err.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-func-dstr-var-obj-ptrn-prop-id-init-throws.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-func-dstr-var-obj-ptrn-prop-id-init-unresolvable.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-array-elem-init-simple-no-strict.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-array-elem-init-yield-expr.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-array-elem-iter-get-err.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-array-elem-iter-nrml-close-err.js"><reason></reason></test>
@ -8394,7 +8390,6 @@
<test id="language/statements/for-await-of/async-gen-decl-dstr-array-elem-nested-obj-yield-expr.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-array-elem-put-prop-ref-user-err.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-array-elem-put-unresolvable-strict.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-array-elem-target-simple-no-strict.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-array-elem-target-yield-expr.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-array-elem-trlg-iter-elision-iter-nrml-close-err.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-array-elem-trlg-iter-elision-iter-nrml-close-null.js"><reason></reason></test>
@ -8404,9 +8399,7 @@
<test id="language/statements/for-await-of/async-gen-decl-dstr-array-rest-nested-array-yield-expr.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-array-rest-nested-obj-yield-expr.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-array-rest-yield-expr.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-obj-id-init-simple-no-strict.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-obj-id-init-yield-expr.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-obj-id-simple-no-strict.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-obj-prop-elem-init-yield-expr.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-obj-prop-elem-target-yield-expr.js"><reason></reason></test>
<test id="language/statements/for-await-of/async-gen-decl-dstr-obj-prop-nested-array-yield-expr.js"><reason></reason></test>
@ -8772,7 +8765,6 @@
<test id="language/global-code/script-decl-func-err-non-extensible.js"><reason></reason></test>
<test id="language/global-code/script-decl-func.js"><reason></reason></test>
<test id="language/global-code/script-decl-lex-deletion.js"><reason></reason></test>
<test id="language/global-code/script-decl-lex-restricted-global.js"><reason></reason></test>
<test id="language/global-code/script-decl-lex.js"><reason></reason></test>
<test id="language/global-code/script-decl-var-err.js"><reason></reason></test>
<!-- Missing test262 support in JerryScript REPL - missing $262 object -->

124
tests/unit-core/test-api.c
View File

@ -851,7 +851,7 @@ main (void)
if (jerry_is_feature_enabled (JERRY_FEATURE_SYMBOL))
{
jerry_init (JERRY_INIT_EMPTY);
const jerry_char_t scoped_src_p[] = "let a;";
const jerry_char_t scoped_src_p[] = "let a; this.b = 5";
jerry_value_t parse_result = jerry_parse (NULL,
0,
scoped_src_p,
@ -885,6 +885,128 @@ main (void)
JERRY_PARSE_NO_OPTS);
TEST_ASSERT (!jerry_value_is_error (parse_result));
jerry_release_value (parse_result);
/* The already existing global binding should not affect a new lexical binding */
const jerry_char_t scoped_src2_p[] = "let b = 6; this.b + b";
parse_result = jerry_parse (NULL,
0,
scoped_src2_p,
sizeof (scoped_src2_p) - 1,
JERRY_PARSE_NO_OPTS);
TEST_ASSERT (!jerry_value_is_error (parse_result));
run_result = jerry_run (parse_result);
TEST_ASSERT (jerry_value_is_number (run_result));
TEST_ASSERT (jerry_get_number_value (run_result) == 11);
jerry_release_value (run_result);
jerry_release_value (parse_result);
/* Check restricted global property */
const jerry_char_t scoped_src3_p[] = "let undefined;";
parse_result = jerry_parse (NULL,
0,
scoped_src3_p,
sizeof (scoped_src3_p) - 1,
JERRY_PARSE_NO_OPTS);
TEST_ASSERT (!jerry_value_is_error (parse_result));
run_result = jerry_run (parse_result);
TEST_ASSERT (jerry_value_is_error (run_result));
TEST_ASSERT (jerry_get_error_type (run_result) == JERRY_ERROR_SYNTAX);
jerry_release_value (run_result);
jerry_release_value (parse_result);
jerry_value_t global_obj = jerry_get_global_object ();
jerry_value_t prop_name = jerry_create_string ((const jerry_char_t *) "foo");
jerry_property_descriptor_t prop_desc;
jerry_init_property_descriptor_fields (&prop_desc);
prop_desc.is_value_defined = true;
prop_desc.value = jerry_create_number (5.2);
jerry_value_t define_result = jerry_define_own_property (global_obj, prop_name, &prop_desc);
TEST_ASSERT (jerry_value_is_boolean (define_result) && jerry_get_boolean_value (define_result));
jerry_release_value (define_result);
jerry_free_property_descriptor_fields (&prop_desc);
jerry_release_value (prop_name);
jerry_release_value (global_obj);
const jerry_char_t scoped_src4_p[] = "let foo;";
parse_result = jerry_parse (NULL,
0,
scoped_src4_p,
sizeof (scoped_src4_p) - 1,
JERRY_PARSE_NO_OPTS);
TEST_ASSERT (!jerry_value_is_error (parse_result));
run_result = jerry_run (parse_result);
TEST_ASSERT (jerry_value_is_error (run_result));
TEST_ASSERT (jerry_get_error_type (run_result) == JERRY_ERROR_SYNTAX);
jerry_release_value (run_result);
jerry_release_value (parse_result);
if (jerry_is_feature_enabled (JERRY_FEATURE_REALM))
{
const jerry_char_t proxy_src_p[] = "new Proxy({}, { getOwnPropertyDescriptor() { throw 42.1 }})";
jerry_value_t proxy = jerry_eval (proxy_src_p, sizeof (proxy_src_p) - 1, JERRY_PARSE_NO_OPTS);
TEST_ASSERT (jerry_value_is_object (proxy));
jerry_value_t new_realm_value = jerry_create_realm ();
jerry_value_t set_realm_this_result = jerry_realm_set_this (new_realm_value, proxy);
TEST_ASSERT (jerry_value_is_boolean (set_realm_this_result) && jerry_get_boolean_value (set_realm_this_result));
jerry_release_value (set_realm_this_result);
jerry_value_t old_realm = jerry_set_realm (new_realm_value);
const jerry_char_t scoped_src5_p[] = "let a;";
parse_result = jerry_parse (NULL,
0,
scoped_src5_p,
sizeof (scoped_src5_p) - 1,
JERRY_PARSE_NO_OPTS);
TEST_ASSERT (!jerry_value_is_error (parse_result));
run_result = jerry_run (parse_result);
TEST_ASSERT (jerry_value_is_error (run_result));
jerry_value_t error_value = jerry_get_value_from_error (run_result, false);
TEST_ASSERT (jerry_value_is_number (error_value) && jerry_get_number_value (error_value) == 42.1);
jerry_release_value (error_value);
jerry_release_value (run_result);
jerry_release_value (parse_result);
jerry_set_realm (old_realm);
jerry_release_value (new_realm_value);
jerry_release_value (proxy);
const jerry_char_t proxy_src2_p[] = "new Proxy(Object.defineProperty({}, 'b', {value: 5.2}), {})";
proxy = jerry_eval (proxy_src2_p, sizeof (proxy_src2_p) - 1, JERRY_PARSE_NO_OPTS);
TEST_ASSERT (jerry_value_is_object (proxy));
new_realm_value = jerry_create_realm ();
set_realm_this_result = jerry_realm_set_this (new_realm_value, proxy);
TEST_ASSERT (jerry_value_is_boolean (set_realm_this_result) && jerry_get_boolean_value (set_realm_this_result));
jerry_release_value (set_realm_this_result);
old_realm = jerry_set_realm (new_realm_value);
const jerry_char_t scoped_src6_p[] = "let b;";
parse_result = jerry_parse (NULL,
0,
scoped_src6_p,
sizeof (scoped_src6_p) - 1,
JERRY_PARSE_NO_OPTS);
TEST_ASSERT (!jerry_value_is_error (parse_result));
run_result = jerry_run (parse_result);
TEST_ASSERT (jerry_value_is_error (run_result));
TEST_ASSERT (jerry_value_is_error (run_result));
TEST_ASSERT (jerry_get_error_type (run_result) == JERRY_ERROR_SYNTAX);
jerry_release_value (run_result);
jerry_release_value (parse_result);
jerry_set_realm (old_realm);
jerry_release_value (new_realm_value);
jerry_release_value (proxy);
}
jerry_cleanup ();
}