Skip to content

Commit 348e6a4

Browse files
gergocsgergocs
authored
Accessors should be kept alive during their invocation (#5167)
This patch fixes #4900. The implementation is based on PR #4943, only resolved the conflicts. Co-authored-by: Robert Fancsik [email protected] JerryScript-DCO-1.0-Signed-off-by: Gergo Csizi [email protected]
1 parent 38e05b4 commit 348e6a4

File tree

6 files changed

+104
-38
lines changed

6 files changed

+104
-38
lines changed

‎jerry-core/ecma/operations/ecma-function-object.c

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,6 +1359,55 @@ ecma_op_function_call_bound (ecma_object_t *func_obj_p, /**< Function object */
13591359
return ret_value;
13601360
} /* ecma_op_function_call_bound */
13611361

1362+
/**
1363+
* Invoke accessor getter function
1364+
*
1365+
* @return ecma value
1366+
* Returned value must be freed with ecma_free_value
1367+
*/
1368+
extern inline ecma_value_t JERRY_ATTR_ALWAYS_INLINE
1369+
ecma_op_invoke_getter (ecma_getter_setter_pointers_t *get_set_pair_p, /**< accessor pair */
1370+
ecma_value_t this_value) /**< 'this' argument's value */
1371+
{
1372+
if (get_set_pair_p->getter_cp == JMEM_CP_NULL)
1373+
{
1374+
return ECMA_VALUE_UNDEFINED;
1375+
}
1376+
1377+
ecma_object_t *getter_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, get_set_pair_p->getter_cp);
1378+
ecma_ref_object (getter_p);
1379+
1380+
ecma_value_t result = ecma_op_function_call (getter_p, this_value, NULL, 0);
1381+
ecma_deref_object (getter_p);
1382+
1383+
return result;
1384+
} /* ecma_op_invoke_getter */
1385+
1386+
/**
1387+
* Invoke accessor setter function
1388+
*
1389+
* @return ecma value
1390+
* Returned value must be freed with ecma_free_value
1391+
*/
1392+
extern inline ecma_value_t JERRY_ATTR_ALWAYS_INLINE
1393+
ecma_op_invoke_setter (ecma_getter_setter_pointers_t *get_set_pair_p, /**< accessor pair */
1394+
ecma_value_t this_value, /**< 'this' argument's value */
1395+
ecma_value_t value) /**< value to set */
1396+
{
1397+
if (get_set_pair_p->setter_cp == JMEM_CP_NULL)
1398+
{
1399+
return ecma_raise_type_error (ECMA_ERR_PRIVATE_FIELD_WAS_DEFINED_WITHOUT_A_SETTER);
1400+
}
1401+
1402+
ecma_object_t *setter_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, get_set_pair_p->setter_cp);
1403+
ecma_ref_object (setter_p);
1404+
1405+
ecma_value_t result = ecma_op_function_call (setter_p, this_value, &value, 1);
1406+
ecma_deref_object (setter_p);
1407+
1408+
return result;
1409+
} /* ecma_op_invoke_setter */
1410+
13621411
/**
13631412
* General [[Call]] implementation
13641413
*

‎jerry-core/ecma/operations/ecma-function-object.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ ecma_object_t *ecma_op_get_prototype_from_constructor (ecma_object_t *ctor_obj_p
7979

8080
ecma_value_t ecma_op_function_has_instance (ecma_object_t *func_obj_p, ecma_value_t value);
8181

82+
ecma_value_t ecma_op_invoke_getter (ecma_getter_setter_pointers_t *get_set_pair_p, ecma_value_t this_value);
83+
84+
ecma_value_t
85+
ecma_op_invoke_setter (ecma_getter_setter_pointers_t *get_set_pair_p, ecma_value_t this_value, ecma_value_t value);
86+
8287
ecma_value_t ecma_op_function_validated_call (ecma_value_t callee,
8388
ecma_value_t this_arg_value,
8489
const ecma_value_t *arguments_list_p,

‎jerry-core/ecma/operations/ecma-objects.c

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -697,16 +697,7 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */
697697
return ecma_fast_copy_value (prop_value_p->value);
698698
}
699699

700-
ecma_getter_setter_pointers_t *get_set_pair_p = ecma_get_named_accessor_property (prop_value_p);
701-
702-
if (get_set_pair_p->getter_cp == JMEM_CP_NULL)
703-
{
704-
return ECMA_VALUE_UNDEFINED;
705-
}
706-
707-
ecma_object_t *getter_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, get_set_pair_p->getter_cp);
708-
709-
return ecma_op_function_call (getter_p, base_value, NULL, 0);
700+
return ecma_op_invoke_getter (ecma_get_named_accessor_property (prop_value_p), base_value);
710701
} /* ecma_op_object_find_own */
711702

712703
/**
@@ -1474,6 +1465,7 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */
14741465
}
14751466
}
14761467

1468+
ecma_getter_setter_pointers_t *get_set_pair_p = NULL;
14771469
jmem_cpointer_t setter_cp = JMEM_CP_NULL;
14781470

14791471
if (property_p != NULL)
@@ -1497,7 +1489,6 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */
14971489
}
14981490
else
14991491
{
1500-
ecma_getter_setter_pointers_t *get_set_pair_p;
15011492
get_set_pair_p = ecma_get_named_accessor_property (ECMA_PROPERTY_VALUE_PTR (property_p));
15021493
setter_cp = get_set_pair_p->setter_cp;
15031494
}
@@ -1538,7 +1529,8 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */
15381529

15391530
if (!(inherited_property & ECMA_PROPERTY_FLAG_DATA))
15401531
{
1541-
setter_cp = ecma_get_named_accessor_property (property_ref.value_p)->setter_cp;
1532+
get_set_pair_p = ecma_get_named_accessor_property (property_ref.value_p);
1533+
setter_cp = get_set_pair_p->setter_cp;
15421534
create_new_property = false;
15431535
break;
15441536
}
@@ -1611,8 +1603,7 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */
16111603
return ecma_raise_readonly_assignment (property_name_p, is_throw);
16121604
}
16131605

1614-
ecma_value_t ret_value =
1615-
ecma_op_function_call (ECMA_GET_NON_NULL_POINTER (ecma_object_t, setter_cp), receiver, &value, 1);
1606+
ecma_value_t ret_value = ecma_op_invoke_setter (get_set_pair_p, receiver, value);
16161607

16171608
if (!ECMA_IS_VALUE_ERROR (ret_value))
16181609
{

‎jerry-core/ecma/operations/ecma-reference.c

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -354,17 +354,8 @@ ecma_op_resolve_reference_value (ecma_object_t *lex_env_p, /**< starting lexical
354354
return ecma_fast_copy_value (prop_value_p->value);
355355
}
356356

357-
ecma_getter_setter_pointers_t *get_set_pair_p = ecma_get_named_accessor_property (prop_value_p);
358-
359-
if (get_set_pair_p->getter_cp == JMEM_CP_NULL)
360-
{
361-
return ECMA_VALUE_UNDEFINED;
362-
}
363-
364-
ecma_object_t *getter_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, get_set_pair_p->getter_cp);
365-
366-
ecma_value_t base_value = ecma_make_object_value (binding_obj_p);
367-
return ecma_op_function_call (getter_p, base_value, NULL, 0);
357+
return ecma_op_invoke_getter (ecma_get_named_accessor_property (prop_value_p),
358+
ecma_make_object_value (binding_obj_p));
368359
}
369360
#endif /* JERRY_LCACHE */
370361
}

‎jerry-core/vm/opcodes.c

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,17 +1430,7 @@ opfunc_private_set (ecma_value_t base, /**< this object */
14301430
else
14311431
{
14321432
ecma_getter_setter_pointers_t *get_set_pair_p = ecma_get_named_accessor_property (ECMA_PROPERTY_VALUE_PTR (prop_p));
1433-
1434-
if (get_set_pair_p->setter_cp == JMEM_CP_NULL)
1435-
{
1436-
result = ecma_raise_type_error (ECMA_ERR_PRIVATE_FIELD_WAS_DEFINED_WITHOUT_A_SETTER);
1437-
}
1438-
else
1439-
{
1440-
ecma_object_t *setter_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, get_set_pair_p->setter_cp);
1441-
1442-
result = ecma_op_function_call (setter_p, base, &value, 1);
1443-
}
1433+
result = ecma_op_invoke_setter (get_set_pair_p, base, value);
14441434
}
14451435

14461436
ecma_deref_object (obj_p);
@@ -1493,8 +1483,7 @@ opfunc_private_get (ecma_value_t base, /**< this object */
14931483
}
14941484
else
14951485
{
1496-
ecma_object_t *getter_p = ECMA_GET_NON_NULL_POINTER (ecma_object_t, get_set_pair_p->getter_cp);
1497-
result = ecma_op_function_call (getter_p, base, NULL, 0);
1486+
result = ecma_op_invoke_getter (get_set_pair_p, base);
14981487
}
14991488
}
15001489

‎tests/jerry/es.next/regression-test-issue-4900.js

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// Copyright JS Foundation and other contributors, http://js.foundation
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
function assertArrayEqual(actual, expected) {
16+
assert(actual.length === expected.length);
17+
18+
for (var i = 0; i < actual.length; i++) {
19+
assert(actual[i] === expected[i]);
20+
}
21+
}
22+
23+
var i = 0;
24+
var a = [];
25+
var JSEtest = [];
26+
27+
JSEtest.__defineGetter__(0, function NaN() {
28+
if (i++ > 2) {
29+
return;
30+
}
31+
32+
JSEtest.shift();
33+
gc();
34+
a.push(0);
35+
a.concat(JSEtest);
36+
});
37+
38+
JSEtest[0];
39+
40+
assertArrayEqual(a, [0, 0, 0]);
41+
assertArrayEqual(JSEtest, []);

0 commit comments

Comments
 (0)