Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit eacee27

Browse files
zherczegzherczeg
committedSep 22, 2021
Add property key filters for built-in functions
JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg [email protected]
1 parent 3a788a2 commit eacee27

19 files changed

+255
-156
lines changed
 

‎jerry-core/api/jerry.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4607,7 +4607,7 @@ jerry_object_get_property_names (const jerry_value_t obj_val, /**< object */
46074607
while (true)
46084608
{
46094609
/* Step 1. Get Object.[[OwnKeys]] */
4610-
ecma_collection_t *prop_names_p = ecma_op_object_own_property_keys (obj_iter_p);
4610+
ecma_collection_t *prop_names_p = ecma_op_object_own_property_keys (obj_iter_p, filter);
46114611

46124612
#if JERRY_BUILTIN_PROXY
46134613
if (prop_names_p == NULL)

‎jerry-core/ecma/builtin-objects/ecma-builtin-object.c

+15-7
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ ecma_builtin_object_set_integrity_level (ecma_object_t *obj_p, /**< object */
336336
}
337337

338338
/* 6. */
339-
ecma_collection_t *props_p = ecma_op_object_own_property_keys (obj_p);
339+
ecma_collection_t *props_p = ecma_op_object_own_property_keys (obj_p, JERRY_PROPERTY_FILTER_ALL);
340340

341341
#if JERRY_BUILTIN_PROXY
342342
if (props_p == NULL)
@@ -596,7 +596,7 @@ ecma_builtin_object_test_integrity_level (ecma_object_t *obj_p, /**< routine's a
596596
ecma_value_t ret_value = ECMA_VALUE_TRUE;
597597

598598
/* 2. */
599-
ecma_collection_t *props_p = ecma_op_object_own_property_keys (obj_p);
599+
ecma_collection_t *props_p = ecma_op_object_own_property_keys (obj_p, JERRY_PROPERTY_FILTER_ALL);
600600

601601
#if JERRY_BUILTIN_PROXY
602602
if (props_p == NULL)
@@ -750,7 +750,7 @@ static ecma_value_t
750750
ecma_builtin_object_object_get_own_property_descriptors (ecma_object_t *obj_p) /**< routine's first argument */
751751
{
752752
/* 2 */
753-
ecma_collection_t *prop_names_p = ecma_op_object_own_property_keys (obj_p);
753+
ecma_collection_t *prop_names_p = ecma_op_object_own_property_keys (obj_p, JERRY_PROPERTY_FILTER_ALL);
754754

755755
#if JERRY_BUILTIN_PROXY
756756
if (prop_names_p == NULL)
@@ -831,7 +831,7 @@ ecma_builtin_object_object_define_properties (ecma_object_t *obj_p, /**< routine
831831
ecma_object_t *props_p = ecma_get_object_from_value (props);
832832

833833
/* 3. */
834-
ecma_collection_t *prop_names_p = ecma_op_object_own_property_keys (props_p);
834+
ecma_collection_t *prop_names_p = ecma_op_object_own_property_keys (props_p, JERRY_PROPERTY_FILTER_ALL);
835835
ecma_value_t ret_value = ECMA_VALUE_ERROR;
836836

837837
#if JERRY_BUILTIN_PROXY
@@ -1073,7 +1073,7 @@ ecma_builtin_object_object_assign (ecma_object_t *target_p, /**< target object *
10731073
ecma_object_t *from_obj_p = ecma_get_object_from_value (from_value);
10741074

10751075
/* 5.b.iii */
1076-
ecma_collection_t *props_p = ecma_op_object_own_property_keys (from_obj_p);
1076+
ecma_collection_t *props_p = ecma_op_object_own_property_keys (from_obj_p, JERRY_PROPERTY_FILTER_ALL);
10771077

10781078
#if JERRY_BUILTIN_PROXY
10791079
if (props_p == NULL)
@@ -1327,7 +1327,15 @@ ecma_op_object_get_own_property_keys (ecma_value_t this_arg, /**< this argument
13271327
ecma_object_t *obj_p = ecma_get_object_from_value (object);
13281328

13291329
/* 2. */
1330-
ecma_collection_t *props_p = ecma_op_object_own_property_keys (obj_p);
1330+
jerry_property_filter_t filter = JERRY_PROPERTY_FILTER_EXLCUDE_SYMBOLS;
1331+
1332+
if (type == ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_SYMBOLS)
1333+
{
1334+
filter = (JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS
1335+
| JERRY_PROPERTY_FILTER_EXLCUDE_INTEGER_INDICES);
1336+
}
1337+
1338+
ecma_collection_t *props_p = ecma_op_object_own_property_keys (obj_p, filter);
13311339

13321340
if (props_p == NULL)
13331341
{
@@ -1361,7 +1369,7 @@ ecma_op_object_get_own_property_keys (ecma_value_t this_arg, /**< this argument
13611369
#else /* !JERRY_ESNEXT */
13621370
JERRY_UNUSED (type);
13631371
ecma_object_t *obj_p = ecma_get_object_from_value (this_arg);
1364-
ecma_collection_t *props_p = ecma_op_object_own_property_keys (obj_p);
1372+
ecma_collection_t *props_p = ecma_op_object_own_property_keys (obj_p, JERRY_PROPERTY_FILTER_ALL);
13651373
return ecma_op_new_array_object_from_collection (props_p, false);
13661374
#endif /* JERRY_ESNEXT */
13671375
} /* ecma_op_object_get_own_property_keys */

‎jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ ecma_builtin_reflect_dispatch_routine (uint8_t builtin_routine_id, /**< built-in
163163
ecma_object_t *target_p = ecma_get_object_from_value (arguments_list[0]);
164164

165165
/* 2. */
166-
ecma_collection_t *prop_names = ecma_op_object_own_property_keys (target_p);
166+
ecma_collection_t *prop_names = ecma_op_object_own_property_keys (target_p, JERRY_PROPERTY_FILTER_ALL);
167167

168168
#if JERRY_BUILTIN_PROXY
169169
if (prop_names == NULL)

‎jerry-core/ecma/builtin-objects/ecma-builtins.c

+83-38
Original file line numberDiff line numberDiff line change
@@ -1414,11 +1414,17 @@ ecma_builtin_native_handler_list_lazy_property_names (ecma_object_t *object_p, /
14141414
void
14151415
ecma_builtin_routine_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in object */
14161416
ecma_collection_t *prop_names_p, /**< prop name collection */
1417-
ecma_property_counter_t *prop_counter_p) /**< prop counter */
1417+
ecma_property_counter_t *prop_counter_p, /**< property counters */
1418+
jerry_property_filter_t filter) /**< name filters */
14181419
{
14191420
JERRY_ASSERT (ecma_get_object_type (object_p) == ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION);
14201421
JERRY_ASSERT (ecma_builtin_function_is_routine (object_p));
14211422

1423+
if (filter & JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS)
1424+
{
1425+
return;
1426+
}
1427+
14221428
#if JERRY_ESNEXT
14231429
ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p;
14241430

@@ -1456,7 +1462,8 @@ ecma_builtin_routine_list_lazy_property_names (ecma_object_t *object_p, /**< a b
14561462
void
14571463
ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in object */
14581464
ecma_collection_t *prop_names_p, /**< prop name collection */
1459-
ecma_property_counter_t *prop_counter_p) /**< prop counter */
1465+
ecma_property_counter_t *prop_counter_p, /**< property counters */
1466+
jerry_property_filter_t filter) /**< name filters */
14601467
{
14611468
JERRY_ASSERT (ecma_get_object_type (object_p) != ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION
14621469
|| !ecma_builtin_function_is_routine (object_p));
@@ -1477,57 +1484,95 @@ ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in
14771484

14781485
JERRY_ASSERT (builtin_id < ECMA_BUILTIN_ID__COUNT);
14791486

1480-
const ecma_builtin_property_descriptor_t *curr_property_p = ecma_builtin_property_list_references[builtin_id];
1481-
1482-
uint32_t index = 0;
1483-
uint8_t bitset = built_in_props_p->u2.instantiated_bitset[0];
1487+
#if JERRY_ESNEXT
1488+
bool has_symbol = true;
1489+
#endif /* JERRY_BUILTIN_REALMS */
14841490

1491+
if (!(filter & JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS))
1492+
{
1493+
const ecma_builtin_property_descriptor_t *curr_property_p = ecma_builtin_property_list_references[builtin_id];
1494+
uint8_t bitset = built_in_props_p->u2.instantiated_bitset[0];
14851495
#if JERRY_BUILTIN_REALMS
1486-
uint8_t *bitset_p = built_in_props_p->u2.instantiated_bitset + 1 + sizeof (ecma_value_t);
1496+
uint8_t *bitset_p = built_in_props_p->u2.instantiated_bitset + 1 + sizeof (ecma_value_t);
14871497
#else /* !JERRY_BUILTIN_REALMS */
1488-
uint8_t *bitset_p = built_in_props_p->u2.instantiated_bitset + 1;
1498+
uint8_t *bitset_p = built_in_props_p->u2.instantiated_bitset + 1;
14891499
#endif /* JERRY_BUILTIN_REALMS */
1500+
uint32_t index = 0;
14901501

1491-
while (curr_property_p->magic_string_id != LIT_MAGIC_STRING__COUNT)
1492-
{
1493-
if (index == 8)
1502+
#if JERRY_ESNEXT
1503+
has_symbol = false;
1504+
#endif /* JERRY_BUILTIN_REALMS */
1505+
1506+
while (curr_property_p->magic_string_id != LIT_MAGIC_STRING__COUNT)
14941507
{
1495-
bitset = *bitset_p++;
1496-
index = 0;
1497-
}
1508+
if (index == 8)
1509+
{
1510+
bitset = *bitset_p++;
1511+
index = 0;
1512+
}
14981513

1499-
uint32_t bit_for_index = (uint32_t) 1u << index;
1514+
uint32_t bit_for_index = (uint32_t) 1u << index;
15001515

1501-
if (curr_property_p->magic_string_id > LIT_NON_INTERNAL_MAGIC_STRING__COUNT)
1502-
{
15031516
#if JERRY_ESNEXT
1504-
if (LIT_IS_GLOBAL_SYMBOL (curr_property_p->magic_string_id))
1505-
{
1506-
ecma_string_t *name_p = ecma_op_get_global_symbol (curr_property_p->magic_string_id);
1517+
bool is_symbol = (curr_property_p->magic_string_id > LIT_NON_INTERNAL_MAGIC_STRING__COUNT);
1518+
#else /* !JERRY_ESNEXT */
1519+
bool is_symbol = false;
1520+
#endif /* JERRY_ESNEXT */
15071521

1508-
if (!(bitset & bit_for_index))
1509-
{
1510-
ecma_value_t name = ecma_make_symbol_value (name_p);
1511-
ecma_collection_push_back (prop_names_p, name);
1512-
prop_counter_p->symbol_named_props++;
1513-
}
1514-
else
1515-
{
1516-
ecma_deref_ecma_string (name_p);
1517-
}
1518-
}
1522+
if (is_symbol)
1523+
{
1524+
#if JERRY_ESNEXT
1525+
JERRY_ASSERT (LIT_IS_GLOBAL_SYMBOL (curr_property_p->magic_string_id));
1526+
has_symbol = true;
15191527
#endif /* JERRY_ESNEXT */
1528+
}
1529+
else if (!(bitset & bit_for_index))
1530+
{
1531+
ecma_value_t name = ecma_make_magic_string_value ((lit_magic_string_id_t) curr_property_p->magic_string_id);
1532+
ecma_collection_push_back (prop_names_p, name);
1533+
prop_counter_p->string_named_props++;
1534+
}
1535+
1536+
curr_property_p++;
1537+
index++;
15201538
}
1521-
else if (!(bitset & bit_for_index))
1539+
}
1540+
1541+
#if JERRY_ESNEXT
1542+
if (!(filter & JERRY_PROPERTY_FILTER_EXLCUDE_SYMBOLS) && has_symbol)
1543+
{
1544+
const ecma_builtin_property_descriptor_t *curr_property_p = ecma_builtin_property_list_references[builtin_id];
1545+
uint8_t bitset = built_in_props_p->u2.instantiated_bitset[0];
1546+
#if JERRY_BUILTIN_REALMS
1547+
uint8_t *bitset_p = built_in_props_p->u2.instantiated_bitset + 1 + sizeof (ecma_value_t);
1548+
#else /* !JERRY_BUILTIN_REALMS */
1549+
uint8_t *bitset_p = built_in_props_p->u2.instantiated_bitset + 1;
1550+
#endif /* JERRY_BUILTIN_REALMS */
1551+
uint32_t index = 0;
1552+
1553+
while (curr_property_p->magic_string_id != LIT_MAGIC_STRING__COUNT)
15221554
{
1523-
ecma_value_t name = ecma_make_magic_string_value ((lit_magic_string_id_t) curr_property_p->magic_string_id);
1524-
ecma_collection_push_back (prop_names_p, name);
1525-
prop_counter_p->string_named_props++;
1526-
}
1555+
if (index == 8)
1556+
{
1557+
bitset = *bitset_p++;
1558+
index = 0;
1559+
}
15271560

1528-
curr_property_p++;
1529-
index++;
1561+
uint32_t bit_for_index = (uint32_t) 1u << index;
1562+
1563+
if (curr_property_p->magic_string_id > LIT_NON_INTERNAL_MAGIC_STRING__COUNT
1564+
&& !(bitset & bit_for_index))
1565+
{
1566+
ecma_string_t *name_p = ecma_op_get_global_symbol (curr_property_p->magic_string_id);
1567+
ecma_collection_push_back (prop_names_p, ecma_make_symbol_value (name_p));
1568+
prop_counter_p->symbol_named_props++;
1569+
}
1570+
1571+
curr_property_p++;
1572+
index++;
1573+
}
15301574
}
1575+
#endif /* JERRY_ESNEXT */
15311576
} /* ecma_builtin_list_lazy_property_names */
15321577

15331578
/**

‎jerry-core/ecma/builtin-objects/ecma-builtins.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,13 @@ ecma_builtin_routine_delete_built_in_property (ecma_object_t *object_p, ecma_str
138138
void
139139
ecma_builtin_delete_built_in_property (ecma_object_t *object_p, ecma_string_t *property_name_p);
140140
void
141-
ecma_builtin_routine_list_lazy_property_names (ecma_object_t *object_p,
142-
ecma_collection_t *prop_names_p,
143-
ecma_property_counter_t *prop_counter_p);
141+
ecma_builtin_routine_list_lazy_property_names (ecma_object_t *object_p, ecma_collection_t *prop_names_p,
142+
ecma_property_counter_t *prop_counter_p,
143+
jerry_property_filter_t filter);
144144
void
145-
ecma_builtin_list_lazy_property_names (ecma_object_t *object_p,
146-
ecma_collection_t *prop_names_p,
147-
ecma_property_counter_t *prop_counter_p);
145+
ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, ecma_collection_t *prop_names_p,
146+
ecma_property_counter_t *prop_counter_p,
147+
jerry_property_filter_t filter);
148148
bool
149149
ecma_builtin_is_global (ecma_object_t *object_p);
150150
ecma_object_t *

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

+35-27
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,8 @@ ecma_op_arguments_delete_built_in_property (ecma_object_t *object_p, /**< the ob
401401
void
402402
ecma_op_arguments_object_list_lazy_property_names (ecma_object_t *obj_p, /**< arguments object */
403403
ecma_collection_t *prop_names_p, /**< prop name collection */
404-
ecma_property_counter_t *prop_counter_p) /**< property counters */
404+
ecma_property_counter_t *prop_counter_p, /**< property counters */
405+
jerry_property_filter_t filter) /**< property name filter options */
405406
{
406407
JERRY_ASSERT (ecma_object_class_is (obj_p, ECMA_OBJECT_CLASS_ARGUMENTS));
407408

@@ -410,45 +411,52 @@ ecma_op_arguments_object_list_lazy_property_names (ecma_object_t *obj_p, /**< ar
410411
uint32_t arguments_number = arguments_p->header.u.cls.u3.arguments_number;
411412
uint8_t flags = arguments_p->header.u.cls.u1.arguments_flags;
412413

413-
ecma_value_t *argv_p = (ecma_value_t *) (arguments_p + 1);
414-
415-
if (flags & ECMA_ARGUMENTS_OBJECT_MAPPED)
414+
if (!(filter & JERRY_PROPERTY_FILTER_EXLCUDE_INTEGER_INDICES))
416415
{
417-
argv_p = (ecma_value_t *) (((ecma_mapped_arguments_t *) obj_p) + 1);
418-
}
416+
ecma_value_t *argv_p = (ecma_value_t *) (arguments_p + 1);
419417

420-
for (uint32_t index = 0; index < arguments_number; index++)
421-
{
422-
if (!ecma_is_value_empty (argv_p[index]))
418+
if (flags & ECMA_ARGUMENTS_OBJECT_MAPPED)
423419
{
424-
ecma_string_t *index_string_p = ecma_new_ecma_string_from_uint32 (index);
425-
ecma_collection_push_back (prop_names_p, ecma_make_string_value (index_string_p));
426-
prop_counter_p->array_index_named_props++;
420+
argv_p = (ecma_value_t *) (((ecma_mapped_arguments_t *) obj_p) + 1);
427421
}
428-
}
429422

430-
if (!(flags & ECMA_ARGUMENTS_OBJECT_LENGTH_INITIALIZED))
431-
{
432-
ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH));
433-
prop_counter_p->string_named_props++;
423+
for (uint32_t index = 0; index < arguments_number; index++)
424+
{
425+
if (!ecma_is_value_empty (argv_p[index]))
426+
{
427+
ecma_string_t *index_string_p = ecma_new_ecma_string_from_uint32 (index);
428+
ecma_collection_push_back (prop_names_p, ecma_make_string_value (index_string_p));
429+
prop_counter_p->array_index_named_props++;
430+
}
431+
}
434432
}
435433

436-
if (!(flags & ECMA_ARGUMENTS_OBJECT_CALLEE_INITIALIZED))
434+
if (!(filter & JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS))
437435
{
438-
ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_CALLEE));
439-
prop_counter_p->string_named_props++;
440-
}
436+
if (!(flags & ECMA_ARGUMENTS_OBJECT_LENGTH_INITIALIZED))
437+
{
438+
ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH));
439+
prop_counter_p->string_named_props++;
440+
}
441+
442+
if (!(flags & ECMA_ARGUMENTS_OBJECT_CALLEE_INITIALIZED))
443+
{
444+
ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_CALLEE));
445+
prop_counter_p->string_named_props++;
446+
}
441447

442448
#if !JERRY_ESNEXT
443-
if (!(flags & ECMA_ARGUMENTS_OBJECT_MAPPED))
444-
{
445-
ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_CALLER));
446-
prop_counter_p->string_named_props++;
447-
}
449+
if (!(flags & ECMA_ARGUMENTS_OBJECT_MAPPED))
450+
{
451+
ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_CALLER));
452+
prop_counter_p->string_named_props++;
453+
}
448454
#endif /* !JERRY_ESNEXT */
455+
}
449456

450457
#if JERRY_ESNEXT
451-
if (!(flags & ECMA_ARGUMENTS_OBJECT_ITERATOR_INITIALIZED))
458+
if (!(filter & JERRY_PROPERTY_FILTER_EXLCUDE_SYMBOLS)
459+
&& !(flags & ECMA_ARGUMENTS_OBJECT_ITERATOR_INITIALIZED))
452460
{
453461
ecma_string_t *symbol_p = ecma_op_get_global_symbol (LIT_GLOBAL_SYMBOL_ITERATOR);
454462
ecma_collection_push_back (prop_names_p, ecma_make_symbol_value (symbol_p));

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ ecma_op_arguments_delete_built_in_property (ecma_object_t *object_p, ecma_string
3636

3737
void
3838
ecma_op_arguments_object_list_lazy_property_names (ecma_object_t *obj_p, ecma_collection_t *prop_names_p,
39-
ecma_property_counter_t *prop_counter_p);
39+
ecma_property_counter_t *prop_counter_p,
40+
jerry_property_filter_t filter);
4041

4142
ecma_string_t *
4243
ecma_op_arguments_object_get_formal_parameter (ecma_mapped_arguments_t *mapped_arguments_p,

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

+20-12
Original file line numberDiff line numberDiff line change
@@ -649,32 +649,40 @@ ecma_fast_array_set_length (ecma_object_t *object_p, /**< fast access mode array
649649
* @return collection of strings - property names
650650
*/
651651
ecma_collection_t *
652-
ecma_fast_array_object_own_property_keys (ecma_object_t *object_p) /**< fast access mode array object */
652+
ecma_fast_array_object_own_property_keys (ecma_object_t *object_p, /**< fast access mode array object */
653+
jerry_property_filter_t filter) /**< property name filter options */
653654
{
654655
JERRY_ASSERT (ecma_op_object_is_fast_array (object_p));
655656

656-
ecma_extended_object_t *ext_obj_p = (ecma_extended_object_t *) object_p;
657657
ecma_collection_t *ret_p = ecma_new_collection ();
658-
uint32_t length = ext_obj_p->u.array.length;
659658

660-
if (length != 0)
659+
if (!(filter & JERRY_PROPERTY_FILTER_EXLCUDE_INTEGER_INDICES))
661660
{
662-
ecma_value_t *values_p = ECMA_GET_NON_NULL_POINTER (ecma_value_t, object_p->u1.property_list_cp);
661+
ecma_extended_object_t *ext_obj_p = (ecma_extended_object_t *) object_p;
662+
uint32_t length = ext_obj_p->u.array.length;
663663

664-
for (uint32_t i = 0; i < length; i++)
664+
if (length != 0)
665665
{
666-
if (ecma_is_value_array_hole (values_p[i]))
666+
ecma_value_t *values_p = ECMA_GET_NON_NULL_POINTER (ecma_value_t, object_p->u1.property_list_cp);
667+
668+
for (uint32_t i = 0; i < length; i++)
667669
{
668-
continue;
669-
}
670+
if (ecma_is_value_array_hole (values_p[i]))
671+
{
672+
continue;
673+
}
670674

671-
ecma_string_t *index_str_p = ecma_new_ecma_string_from_uint32 (i);
675+
ecma_string_t *index_str_p = ecma_new_ecma_string_from_uint32 (i);
672676

673-
ecma_collection_push_back (ret_p, ecma_make_string_value (index_str_p));
677+
ecma_collection_push_back (ret_p, ecma_make_string_value (index_str_p));
678+
}
674679
}
675680
}
676681

677-
ecma_collection_push_back (ret_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH));
682+
if (!(filter & JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS))
683+
{
684+
ecma_collection_push_back (ret_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH));
685+
}
678686

679687
return ret_p;
680688
} /* ecma_fast_array_object_own_property_keys */

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ uint32_t
9696
ecma_delete_fast_array_properties (ecma_object_t *object_p, uint32_t new_length);
9797

9898
ecma_collection_t *
99-
ecma_fast_array_object_own_property_keys (ecma_object_t *object_p);
99+
ecma_fast_array_object_own_property_keys (ecma_object_t *object_p, jerry_property_filter_t filter);
100100

101101
void
102102
ecma_fast_array_convert_to_normal (ecma_object_t *object_p);

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

+23-12
Original file line numberDiff line numberDiff line change
@@ -2162,8 +2162,14 @@ ecma_op_bound_function_delete_built_in_property (ecma_object_t *object_p, /**< o
21622162
void
21632163
ecma_op_function_list_lazy_property_names (ecma_object_t *object_p, /**< functionobject */
21642164
ecma_collection_t *prop_names_p, /**< prop name collection */
2165-
ecma_property_counter_t *prop_counter_p) /**< prop counter */
2165+
ecma_property_counter_t *prop_counter_p, /**< property counters */
2166+
jerry_property_filter_t filter) /**< property name filter options */
21662167
{
2168+
if (filter & JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS)
2169+
{
2170+
return;
2171+
}
2172+
21672173
const ecma_compiled_code_t *bytecode_data_p;
21682174
bytecode_data_p = ecma_op_function_get_compiled_code ((ecma_extended_object_t *) object_p);
21692175

@@ -2236,21 +2242,20 @@ ecma_op_function_list_lazy_property_names (ecma_object_t *object_p, /**< functio
22362242
void
22372243
ecma_op_external_function_list_lazy_property_names (ecma_object_t *object_p, /**< function object */
22382244
ecma_collection_t *prop_names_p, /**< prop name collection */
2239-
ecma_property_counter_t *prop_counter_p) /**< prop counter */
2245+
ecma_property_counter_t *prop_counter_p, /**< property counters */
2246+
jerry_property_filter_t filter) /**< property name
2247+
* filter options */
22402248
{
2241-
#if !JERRY_ESNEXT
22422249
JERRY_UNUSED (object_p);
2243-
#else /* JERRY_ESNEXT */
2244-
/* TODO: implicit class constructors need rework, and this code should be updated afterwards. */
2245-
ecma_property_t *property_p = ecma_find_named_property (object_p, ecma_get_magic_string (LIT_MAGIC_STRING_PROTOTYPE));
22462250

2247-
if (property_p == NULL || (*property_p & ECMA_PROPERTY_FLAG_BUILT_IN))
2248-
#endif /* !JERRY_ESNEXT */
2251+
if (filter & JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS)
22492252
{
2250-
/* 'prototype' property is non-enumerable (ECMA-262 v5, 13.2.18) */
2251-
ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_PROTOTYPE));
2252-
prop_counter_p->string_named_props++;
2253+
return;
22532254
}
2255+
2256+
/* 'prototype' property is non-enumerable (ECMA-262 v5, 13.2.18) */
2257+
ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_PROTOTYPE));
2258+
prop_counter_p->string_named_props++;
22542259
} /* ecma_op_external_function_list_lazy_property_names */
22552260

22562261
/**
@@ -2263,8 +2268,14 @@ ecma_op_external_function_list_lazy_property_names (ecma_object_t *object_p, /**
22632268
void
22642269
ecma_op_bound_function_list_lazy_property_names (ecma_object_t *object_p, /**< bound function object*/
22652270
ecma_collection_t *prop_names_p, /**< prop name collection */
2266-
ecma_property_counter_t *prop_counter_p) /**< prop counter */
2271+
ecma_property_counter_t *prop_counter_p, /**< property counters */
2272+
jerry_property_filter_t filter) /**< property name filter options */
22672273
{
2274+
if (filter & JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS)
2275+
{
2276+
return;
2277+
}
2278+
22682279
#if JERRY_ESNEXT
22692280
/* Unintialized 'length' property is non-enumerable (ECMA-262 v6, 19.2.4.1) */
22702281
ecma_bound_function_t *bound_func_p = (ecma_bound_function_t *) object_p;

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -117,19 +117,19 @@ ecma_op_bound_function_delete_built_in_property (ecma_object_t *object_p, ecma_s
117117
#endif /* JERRY_ESNEXT */
118118

119119
void
120-
ecma_op_function_list_lazy_property_names (ecma_object_t *object_p,
121-
ecma_collection_t *prop_names_p,
122-
ecma_property_counter_t *prop_counter_p);
120+
ecma_op_function_list_lazy_property_names (ecma_object_t *object_p, ecma_collection_t *prop_names_p,
121+
ecma_property_counter_t *prop_counter_p,
122+
jerry_property_filter_t filter);
123123

124124
void
125-
ecma_op_external_function_list_lazy_property_names (ecma_object_t *object_p,
126-
ecma_collection_t *prop_names_p,
127-
ecma_property_counter_t *prop_counter_p);
125+
ecma_op_external_function_list_lazy_property_names (ecma_object_t *object_p, ecma_collection_t *prop_names_p,
126+
ecma_property_counter_t *prop_counter_p,
127+
jerry_property_filter_t filter);
128128

129129
void
130-
ecma_op_bound_function_list_lazy_property_names (ecma_object_t *object_p,
131-
ecma_collection_t *prop_names_p,
132-
ecma_property_counter_t *prop_counter_p);
130+
ecma_op_bound_function_list_lazy_property_names (ecma_object_t *object_p, ecma_collection_t *prop_names_p,
131+
ecma_property_counter_t *prop_counter_p,
132+
jerry_property_filter_t filter);
133133

134134
/**
135135
* @}

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

+21-16
Original file line numberDiff line numberDiff line change
@@ -2180,7 +2180,7 @@ ecma_op_object_get_enumerable_property_names (ecma_object_t *obj_p, /**< routine
21802180
ecma_enumerable_property_names_options_t option) /**< listing option */
21812181
{
21822182
/* 2. */
2183-
ecma_collection_t *prop_names_p = ecma_op_object_own_property_keys (obj_p);
2183+
ecma_collection_t *prop_names_p = ecma_op_object_own_property_keys (obj_p, JERRY_PROPERTY_FILTER_EXLCUDE_SYMBOLS);
21842184

21852185
#if JERRY_BUILTIN_PROXY
21862186
if (JERRY_UNLIKELY (prop_names_p == NULL))
@@ -2278,15 +2278,16 @@ ecma_op_object_get_enumerable_property_names (ecma_object_t *obj_p, /**< routine
22782278
static void
22792279
ecma_object_list_lazy_property_names (ecma_object_t *obj_p, /**< object */
22802280
ecma_collection_t *prop_names_p, /**< prop name collection */
2281-
ecma_property_counter_t *prop_counter_p) /**< prop counter */
2281+
ecma_property_counter_t *prop_counter_p, /**< property counters */
2282+
jerry_property_filter_t filter) /**< property name filter options */
22822283
{
22832284
switch (ecma_get_object_type (obj_p))
22842285
{
22852286
case ECMA_OBJECT_TYPE_BUILT_IN_FUNCTION:
22862287
{
22872288
if (ecma_builtin_function_is_routine (obj_p))
22882289
{
2289-
ecma_builtin_routine_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p);
2290+
ecma_builtin_routine_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p, filter);
22902291
break;
22912292
}
22922293
/* FALLTHRU */
@@ -2295,7 +2296,7 @@ ecma_object_list_lazy_property_names (ecma_object_t *obj_p, /**< object */
22952296
case ECMA_OBJECT_TYPE_BUILT_IN_CLASS:
22962297
case ECMA_OBJECT_TYPE_BUILT_IN_ARRAY:
22972298
{
2298-
ecma_builtin_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p);
2299+
ecma_builtin_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p, filter);
22992300
break;
23002301
}
23012302
case ECMA_OBJECT_TYPE_CLASS:
@@ -2306,19 +2307,19 @@ ecma_object_list_lazy_property_names (ecma_object_t *obj_p, /**< object */
23062307
{
23072308
case ECMA_OBJECT_CLASS_STRING:
23082309
{
2309-
ecma_op_string_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p);
2310+
ecma_op_string_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p, filter);
23102311
break;
23112312
}
23122313
case ECMA_OBJECT_CLASS_ARGUMENTS:
23132314
{
2314-
ecma_op_arguments_object_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p);
2315+
ecma_op_arguments_object_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p, filter);
23152316
break;
23162317
}
23172318
#if JERRY_BUILTIN_TYPEDARRAY
23182319
/* ES2015 9.4.5.1 */
23192320
case ECMA_OBJECT_CLASS_TYPEDARRAY:
23202321
{
2321-
ecma_op_typedarray_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p);
2322+
ecma_op_typedarray_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p, filter);
23222323
break;
23232324
}
23242325
#endif /* JERRY_BUILTIN_TYPEDARRAY */
@@ -2327,23 +2328,26 @@ ecma_object_list_lazy_property_names (ecma_object_t *obj_p, /**< object */
23272328
}
23282329
case ECMA_OBJECT_TYPE_FUNCTION:
23292330
{
2330-
ecma_op_function_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p);
2331+
ecma_op_function_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p, filter);
23312332
break;
23322333
}
23332334
case ECMA_OBJECT_TYPE_NATIVE_FUNCTION:
23342335
{
2335-
ecma_op_external_function_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p);
2336+
ecma_op_external_function_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p, filter);
23362337
break;
23372338
}
23382339
case ECMA_OBJECT_TYPE_BOUND_FUNCTION:
23392340
{
2340-
ecma_op_bound_function_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p);
2341+
ecma_op_bound_function_list_lazy_property_names (obj_p, prop_names_p, prop_counter_p, filter);
23412342
break;
23422343
}
23432344
case ECMA_OBJECT_TYPE_ARRAY:
23442345
{
2345-
ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH));
2346-
prop_counter_p->string_named_props++;
2346+
if (!(filter & JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS))
2347+
{
2348+
ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH));
2349+
prop_counter_p->string_named_props++;
2350+
}
23472351
break;
23482352
}
23492353
default:
@@ -2486,7 +2490,8 @@ ecma_object_sort_property_names (ecma_collection_t *prop_names_p, /**< prop name
24862490
* collection of property names - otherwise
24872491
*/
24882492
ecma_collection_t *
2489-
ecma_op_object_own_property_keys (ecma_object_t *obj_p) /**< object */
2493+
ecma_op_object_own_property_keys (ecma_object_t *obj_p, /**< object */
2494+
jerry_property_filter_t filter) /**< property name filter options */
24902495
{
24912496
#if JERRY_BUILTIN_PROXY
24922497
if (ECMA_OBJECT_IS_PROXY (obj_p))
@@ -2497,13 +2502,13 @@ ecma_op_object_own_property_keys (ecma_object_t *obj_p) /**< object */
24972502

24982503
if (ecma_op_object_is_fast_array (obj_p))
24992504
{
2500-
return ecma_fast_array_object_own_property_keys (obj_p);
2505+
return ecma_fast_array_object_own_property_keys (obj_p, filter);
25012506
}
25022507

25032508
ecma_collection_t *prop_names_p = ecma_new_collection ();
25042509
ecma_property_counter_t prop_counter = {0, 0, 0, 0, 0};
25052510

2506-
ecma_object_list_lazy_property_names (obj_p, prop_names_p, &prop_counter);
2511+
ecma_object_list_lazy_property_names (obj_p, prop_names_p, &prop_counter, filter);
25072512

25082513
prop_counter.lazy_string_named_props = prop_names_p->item_count - prop_counter.symbol_named_props;
25092514
prop_counter.lazy_symbol_named_props = prop_counter.symbol_named_props;
@@ -2595,7 +2600,7 @@ ecma_op_object_enumerate (ecma_object_t *obj_p) /**< object */
25952600

25962601
while (true)
25972602
{
2598-
ecma_collection_t *keys = ecma_op_object_own_property_keys (obj_p);
2603+
ecma_collection_t *keys = ecma_op_object_own_property_keys (obj_p, JERRY_PROPERTY_FILTER_EXLCUDE_SYMBOLS);
25992604

26002605
#if JERRY_ESNEXT
26012606
if (JERRY_UNLIKELY (keys == NULL))

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ ecma_object_t *ecma_op_object_get_prototype_of (ecma_object_t *obj_p);
9797
ecma_value_t ecma_op_object_is_prototype_of (ecma_object_t *base_p, ecma_object_t *target_p);
9898
ecma_collection_t * ecma_op_object_get_enumerable_property_names (ecma_object_t *obj_p,
9999
ecma_enumerable_property_names_options_t option);
100-
ecma_collection_t *ecma_op_object_own_property_keys (ecma_object_t *obj_p);
100+
ecma_collection_t *ecma_op_object_own_property_keys (ecma_object_t *obj_p, jerry_property_filter_t filter);
101101
ecma_collection_t *ecma_op_object_enumerate (ecma_object_t *obj_p);
102102

103103
lit_magic_string_id_t ecma_object_get_class_name (ecma_object_t *obj_p);

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1628,7 +1628,7 @@ ecma_proxy_object_own_property_keys (ecma_object_t *obj_p) /**< proxy object */
16281628
/* 6. */
16291629
if (ecma_is_value_undefined (trap))
16301630
{
1631-
ecma_collection_t *result = ecma_op_object_own_property_keys (target_obj_p);
1631+
ecma_collection_t *result = ecma_op_object_own_property_keys (target_obj_p, JERRY_PROPERTY_FILTER_ALL);
16321632
JERRY_BLOCK_TAIL_CALL_OPTIMIZATION ();
16331633
return result;
16341634
}
@@ -1674,7 +1674,7 @@ ecma_proxy_object_own_property_keys (ecma_object_t *obj_p) /**< proxy object */
16741674
}
16751675

16761676
/* 11. */
1677-
ecma_collection_t *target_keys = ecma_op_object_own_property_keys (target_obj_p);
1677+
ecma_collection_t *target_keys = ecma_op_object_own_property_keys (target_obj_p, JERRY_PROPERTY_FILTER_ALL);
16781678

16791679
if (target_keys == NULL)
16801680
{

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

+21-14
Original file line numberDiff line numberDiff line change
@@ -105,29 +105,36 @@ ecma_op_create_string_object (const ecma_value_t *arguments_list_p, /**< list of
105105
void
106106
ecma_op_string_list_lazy_property_names (ecma_object_t *obj_p, /**< a String object */
107107
ecma_collection_t *prop_names_p, /**< prop name collection */
108-
ecma_property_counter_t *prop_counter_p) /**< prop counter */
108+
ecma_property_counter_t *prop_counter_p, /**< property counters */
109+
jerry_property_filter_t filter) /**< property name filter options */
109110
{
110111
JERRY_ASSERT (ecma_get_object_base_type (obj_p) == ECMA_OBJECT_BASE_TYPE_CLASS);
111112

112-
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) obj_p;
113-
JERRY_ASSERT (ext_object_p->u.cls.type == ECMA_OBJECT_CLASS_STRING);
113+
if (!(filter & JERRY_PROPERTY_FILTER_EXLCUDE_INTEGER_INDICES))
114+
{
115+
ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) obj_p;
116+
JERRY_ASSERT (ext_object_p->u.cls.type == ECMA_OBJECT_CLASS_STRING);
114117

115-
ecma_string_t *prim_value_str_p = ecma_get_string_from_value (ext_object_p->u.cls.u3.value);
118+
ecma_string_t *prim_value_str_p = ecma_get_string_from_value (ext_object_p->u.cls.u3.value);
116119

117-
lit_utf8_size_t length = ecma_string_get_length (prim_value_str_p);
120+
lit_utf8_size_t length = ecma_string_get_length (prim_value_str_p);
118121

119-
for (lit_utf8_size_t i = 0; i < length; i++)
120-
{
121-
ecma_string_t *name_p = ecma_new_ecma_string_from_uint32 (i);
122+
for (lit_utf8_size_t i = 0; i < length; i++)
123+
{
124+
ecma_string_t *name_p = ecma_new_ecma_string_from_uint32 (i);
122125

123-
/* the properties are enumerable (ECMA-262 v5, 15.5.5.2.9) */
124-
ecma_collection_push_back (prop_names_p, ecma_make_string_value (name_p));
125-
}
126+
/* the properties are enumerable (ECMA-262 v5, 15.5.5.2.9) */
127+
ecma_collection_push_back (prop_names_p, ecma_make_string_value (name_p));
128+
}
126129

127-
prop_counter_p->array_index_named_props += length;
130+
prop_counter_p->array_index_named_props += length;
131+
}
128132

129-
ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH));
130-
prop_counter_p->string_named_props++;
133+
if (!(filter & JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS))
134+
{
135+
ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_LENGTH));
136+
prop_counter_p->string_named_props++;
137+
}
131138
} /* ecma_op_string_list_lazy_property_names */
132139

133140
/**

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ ecma_value_t
2929
ecma_op_create_string_object (const ecma_value_t *arguments_list_p, uint32_t arguments_list_len);
3030

3131
void
32-
ecma_op_string_list_lazy_property_names (ecma_object_t *obj_p,
33-
ecma_collection_t *prop_names_p,
34-
ecma_property_counter_t *prop_counter_p);
32+
ecma_op_string_list_lazy_property_names (ecma_object_t *obj_p, ecma_collection_t *prop_names_p,
33+
ecma_property_counter_t *prop_counter_p,
34+
jerry_property_filter_t filter);
3535

3636
/**
3737
* @}

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -1827,10 +1827,16 @@ ecma_is_typedarray (ecma_value_t value) /**< the target need to be checked */
18271827
void
18281828
ecma_op_typedarray_list_lazy_property_names (ecma_object_t *obj_p, /**< a TypedArray object */
18291829
ecma_collection_t *prop_names_p, /**< prop name collection */
1830-
ecma_property_counter_t *prop_counter_p) /**< prop counter */
1830+
ecma_property_counter_t *prop_counter_p, /**< property counters */
1831+
jerry_property_filter_t filter) /**< property name filter options */
18311832
{
18321833
JERRY_ASSERT (ecma_object_is_typedarray (obj_p));
18331834

1835+
if (filter & JERRY_PROPERTY_FILTER_EXLCUDE_INTEGER_INDICES)
1836+
{
1837+
return;
1838+
}
1839+
18341840
uint32_t array_length = ecma_typedarray_get_length (obj_p);
18351841

18361842
for (uint32_t i = 0; i < array_length; i++)

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ ecma_typedarray_iterators_helper (ecma_value_t this_arg, ecma_iterator_kind_t ki
6262

6363
bool ecma_object_is_typedarray (ecma_object_t *obj_p);
6464
bool ecma_is_typedarray (ecma_value_t target);
65-
void ecma_op_typedarray_list_lazy_property_names (ecma_object_t *obj_p,
66-
ecma_collection_t *prop_names_p,
67-
ecma_property_counter_t *prop_counter_p);
65+
void ecma_op_typedarray_list_lazy_property_names (ecma_object_t *obj_p, ecma_collection_t *prop_names_p,
66+
ecma_property_counter_t *prop_counter_p,
67+
jerry_property_filter_t filter);
6868
ecma_value_t ecma_op_typedarray_define_own_property (ecma_object_t *obj_p,
6969
ecma_string_t *prop_name_p,
7070
const ecma_property_descriptor_t *property_desc_p);

‎jerry-core/vm/opcodes.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1558,7 +1558,7 @@ opfunc_copy_data_properties (ecma_value_t target_object, /**< target object */
15581558
}
15591559

15601560
ecma_object_t *source_object_p = ecma_get_object_from_value (source_object);
1561-
ecma_collection_t *names_p = ecma_op_object_own_property_keys (source_object_p);
1561+
ecma_collection_t *names_p = ecma_op_object_own_property_keys (source_object_p, JERRY_PROPERTY_FILTER_ALL);
15621562

15631563
#if JERRY_BUILTIN_PROXY
15641564
if (names_p == NULL)

0 commit comments

Comments
 (0)
Please sign in to comment.