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

Accessors should be kept alive during their invocation (#5167)

Browse Source 
This patch fixes #4900.

The implementation is based on PR #4943, only resolved the conflicts.

Co-authored-by: Robert Fancsik robert.fancsik@h-lab.eu
JerryScript-DCO-1.0-Signed-off-by: Gergo Csizi gergocs@inf.u-szeged.hu
This commit is contained in:
Gergo Csizi 2024-11-18 09:47:07 +01:00 committed by GitHub
parent 38e05b4569
commit 348e6a470e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 104 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
jerry-core/ecma/operations/ecma-function-object.c
View File

@ -1359,6 +1359,55 @@ ecma_op_function_call_bound (ecma_object_t *func_obj_p, /**< Function object */
return ret_value;
} /* ecma_op_function_call_bound */
/**
* Invoke accessor getter function
*
* @return ecma value
* Returned value must be freed with ecma_free_value
*/
extern inline ecma_value_t JERRY_ATTR_ALWAYS_INLINE
ecma_op_invoke_getter (ecma_getter_setter_pointers_t *get_set_pair_p, /**< accessor pair */
ecma_value_t this_value) /**< 'this' argument's value */
{
if (get_set_pair_p->getter_cp == JMEM_CP_NULL)
{
return ECMA_VALUE_UNDEFINED;
}
ecma_object_t *getter_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, get_set_pair_p->getter_cp);
ecma_ref_object (getter_p);
ecma_value_t result = ecma_op_function_call (getter_p, this_value, NULL, 0);
ecma_deref_object (getter_p);
return result;
} /* ecma_op_invoke_getter */
/**
* Invoke accessor setter function
*
* @return ecma value
* Returned value must be freed with ecma_free_value
*/
extern inline ecma_value_t JERRY_ATTR_ALWAYS_INLINE
ecma_op_invoke_setter (ecma_getter_setter_pointers_t *get_set_pair_p, /**< accessor pair */
ecma_value_t this_value, /**< 'this' argument's value */
ecma_value_t value) /**< value to set */
{
if (get_set_pair_p->setter_cp == JMEM_CP_NULL)
{
return ecma_raise_type_error (ECMA_ERR_PRIVATE_FIELD_WAS_DEFINED_WITHOUT_A_SETTER);
}
ecma_object_t *setter_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, get_set_pair_p->setter_cp);
ecma_ref_object (setter_p);
ecma_value_t result = ecma_op_function_call (setter_p, this_value, &value, 1);
ecma_deref_object (setter_p);
return result;
} /* ecma_op_invoke_setter */
/**
* General [[Call]] implementation
*

5
jerry-core/ecma/operations/ecma-function-object.h
View File

@ -79,6 +79,11 @@ ecma_object_t *ecma_op_get_prototype_from_constructor (ecma_object_t *ctor_obj_p
ecma_value_t ecma_op_function_has_instance (ecma_object_t *func_obj_p, ecma_value_t value);
ecma_value_t ecma_op_invoke_getter (ecma_getter_setter_pointers_t *get_set_pair_p, ecma_value_t this_value);
ecma_value_t
ecma_op_invoke_setter (ecma_getter_setter_pointers_t *get_set_pair_p, ecma_value_t this_value, ecma_value_t value);
ecma_value_t ecma_op_function_validated_call (ecma_value_t callee,
ecma_value_t this_arg_value,
const ecma_value_t *arguments_list_p,

19
jerry-core/ecma/operations/ecma-objects.c
View File

@ -697,16 +697,7 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */
return ecma_fast_copy_value (prop_value_p->value);
}
ecma_getter_setter_pointers_t *get_set_pair_p = ecma_get_named_accessor_property (prop_value_p);
if (get_set_pair_p->getter_cp == JMEM_CP_NULL)
{
return ECMA_VALUE_UNDEFINED;
}
ecma_object_t *getter_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, get_set_pair_p->getter_cp);
return ecma_op_function_call (getter_p, base_value, NULL, 0);
return ecma_op_invoke_getter (ecma_get_named_accessor_property (prop_value_p), base_value);
} /* ecma_op_object_find_own */
/**
@ -1474,6 +1465,7 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */
}
}
ecma_getter_setter_pointers_t *get_set_pair_p = NULL;
jmem_cpointer_t setter_cp = JMEM_CP_NULL;
if (property_p != NULL)
@ -1497,7 +1489,6 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */
}
else
{
ecma_getter_setter_pointers_t *get_set_pair_p;
get_set_pair_p = ecma_get_named_accessor_property (ECMA_PROPERTY_VALUE_PTR (property_p));
setter_cp = get_set_pair_p->setter_cp;
}
@ -1538,7 +1529,8 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */
if (!(inherited_property & ECMA_PROPERTY_FLAG_DATA))
{
setter_cp = ecma_get_named_accessor_property (property_ref.value_p)->setter_cp;
get_set_pair_p = ecma_get_named_accessor_property (property_ref.value_p);
setter_cp = get_set_pair_p->setter_cp;
create_new_property = false;
break;
}
@ -1611,8 +1603,7 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */
return ecma_raise_readonly_assignment (property_name_p, is_throw);
}
ecma_value_t ret_value =
ecma_op_function_call (ECMA_GET_NON_NULL_POINTER (ecma_object_t, setter_cp), receiver, &value, 1);
ecma_value_t ret_value = ecma_op_invoke_setter (get_set_pair_p, receiver, value);
if (!ECMA_IS_VALUE_ERROR (ret_value))
{

13
jerry-core/ecma/operations/ecma-reference.c
View File

@ -354,17 +354,8 @@ ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, /**< starting lexical
return ecma_fast_copy_value (prop_value_p->value);
}
ecma_getter_setter_pointers_t *get_set_pair_p = ecma_get_named_accessor_property (prop_value_p);
if (get_set_pair_p->getter_cp == JMEM_CP_NULL)
{
return ECMA_VALUE_UNDEFINED;
}
ecma_object_t *getter_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, get_set_pair_p->getter_cp);
ecma_value_t base_value = ecma_make_object_value (binding_obj_p);
return ecma_op_function_call (getter_p, base_value, NULL, 0);
return ecma_op_invoke_getter (ecma_get_named_accessor_property (prop_value_p),
ecma_make_object_value (binding_obj_p));
}
#endif /* JERRY_LCACHE */
}

15
jerry-core/vm/opcodes.c
View File

@ -1430,17 +1430,7 @@ opfunc_private_set (ecma_value_t base, /**< this object */
else
{
ecma_getter_setter_pointers_t *get_set_pair_p = ecma_get_named_accessor_property (ECMA_PROPERTY_VALUE_PTR (prop_p));
if (get_set_pair_p->setter_cp == JMEM_CP_NULL)
{
result = ecma_raise_type_error (ECMA_ERR_PRIVATE_FIELD_WAS_DEFINED_WITHOUT_A_SETTER);
}
else
{
ecma_object_t *setter_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, get_set_pair_p->setter_cp);
result = ecma_op_function_call (setter_p, base, &value, 1);
}
result = ecma_op_invoke_setter (get_set_pair_p, base, value);
}
ecma_deref_object (obj_p);
@ -1493,8 +1483,7 @@ opfunc_private_get (ecma_value_t base, /**< this object */
}
else
{
ecma_object_t *getter_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, get_set_pair_p->getter_cp);
result = ecma_op_function_call (getter_p, base, NULL, 0);
result = ecma_op_invoke_getter (get_set_pair_p, base);
}
}

41
tests/jerry/es.next/regression-test-issue-4900.js Normal file
View File

@ -0,0 +1,41 @@
// 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 assertArrayEqual(actual, expected) {
assert(actual.length === expected.length);
for (var i = 0; i < actual.length; i++) {
assert(actual[i] === expected[i]);
}
}
var i = 0;
var a = [];
var JSEtest = [];
JSEtest.__defineGetter__(0, function NaN() {
if (i++ > 2) {
return;
}
JSEtest.shift();
gc();
a.push(0);
a.concat(JSEtest);
});
JSEtest[0];
assertArrayEqual(a, [0, 0, 0]);
assertArrayEqual(JSEtest, []);