diff --git a/jerry-core/api/jerry.c b/jerry-core/api/jerry.c index 0fc8e2b8c..0d2e29937 100644 --- a/jerry-core/api/jerry.c +++ b/jerry-core/api/jerry.c @@ -2532,7 +2532,7 @@ jerry_foreach_object_property (const jerry_value_t obj_val, /**< object value */ ecma_value_p = ecma_collection_iterator_next (ecma_value_p); } - ecma_free_values_collection (names_p, true); + ecma_free_values_collection (names_p, 0); if (!ECMA_IS_VALUE_ERROR (property_value)) { diff --git a/jerry-core/ecma/base/ecma-gc.c b/jerry-core/ecma/base/ecma-gc.c index 137a64291..f8f75ef1a 100644 --- a/jerry-core/ecma/base/ecma-gc.c +++ b/jerry-core/ecma/base/ecma-gc.c @@ -598,8 +598,10 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */ case LIT_MAGIC_STRING_PROMISE_UL: { ecma_free_value_if_not_object (ext_object_p->u.class_prop.u.value); - ecma_free_values_collection (((ecma_promise_object_t *) object_p)->fulfill_reactions, false); - ecma_free_values_collection (((ecma_promise_object_t *) object_p)->reject_reactions, false); + ecma_free_values_collection (((ecma_promise_object_t *) object_p)->fulfill_reactions, + ECMA_COLLECTION_NO_REF_OBJECTS); + ecma_free_values_collection (((ecma_promise_object_t *) object_p)->reject_reactions, + ECMA_COLLECTION_NO_REF_OBJECTS); ecma_dealloc_extended_object (object_p, sizeof (ecma_promise_object_t)); return; } diff --git a/jerry-core/ecma/base/ecma-globals.h b/jerry-core/ecma/base/ecma-globals.h index 43ef3fcb8..cff16160a 100644 --- a/jerry-core/ecma/base/ecma-globals.h +++ b/jerry-core/ecma/base/ecma-globals.h @@ -1052,6 +1052,14 @@ typedef double ecma_number_t; * value as well. */ +/** + * Collection flags. + */ +typedef enum +{ + ECMA_COLLECTION_NO_REF_OBJECTS = (1u << 0), /**< do not increase the refcount of objects */ +} ecma_collection_flag_t; + /** * Description of a collection's header. */ diff --git a/jerry-core/ecma/base/ecma-helpers-values-collection.c b/jerry-core/ecma/base/ecma-helpers-values-collection.c index f24f0fcef..69705d10f 100644 --- a/jerry-core/ecma/base/ecma-helpers-values-collection.c +++ b/jerry-core/ecma/base/ecma-helpers-values-collection.c @@ -37,63 +37,15 @@ JERRY_STATIC_ASSERT (ECMA_TYPE_ERROR == ECMA_TYPE_COLLECTION_CHUNK, * @return pointer to the collection's header */ ecma_collection_header_t * -ecma_new_values_collection (const ecma_value_t values_buffer[], /**< ecma values */ - ecma_length_t values_number, /**< number of ecma values */ - bool do_ref_if_object) /**< if the value is object value, - increase reference counter of the object */ +ecma_new_values_collection (void) { - JERRY_ASSERT (values_buffer != NULL || values_number == 0); - ecma_collection_header_t *header_p; header_p = (ecma_collection_header_t *) jmem_pools_alloc (sizeof (ecma_collection_header_t)); - header_p->item_count = values_number; + header_p->item_count = 0; header_p->first_chunk_cp = ECMA_NULL_POINTER; header_p->last_chunk_cp = ECMA_NULL_POINTER; - if (values_number == 0) - { - return header_p; - } - - ecma_collection_chunk_t *current_chunk_p = NULL; - int current_chunk_index = ECMA_COLLECTION_CHUNK_ITEMS; - - for (ecma_length_t value_index = 0; - value_index < values_number; - value_index++) - { - if (unlikely (current_chunk_index >= ECMA_COLLECTION_CHUNK_ITEMS)) - { - ecma_collection_chunk_t *next_chunk_p; - next_chunk_p = (ecma_collection_chunk_t *) jmem_pools_alloc (sizeof (ecma_collection_chunk_t)); - - if (header_p->last_chunk_cp == ECMA_NULL_POINTER) - { - ECMA_SET_POINTER (header_p->first_chunk_cp, next_chunk_p); - header_p->last_chunk_cp = header_p->first_chunk_cp; - } - else - { - current_chunk_p->items[ECMA_COLLECTION_CHUNK_ITEMS] = ecma_make_collection_chunk_value (next_chunk_p); - ECMA_SET_POINTER (header_p->last_chunk_cp, next_chunk_p); - } - - current_chunk_p = next_chunk_p; - current_chunk_index = 0; - } - - ecma_value_t value = values_buffer[value_index]; - - if (do_ref_if_object || !ecma_is_value_object (value)) - { - value = ecma_copy_value (value); - } - - current_chunk_p->items[current_chunk_index++] = value; - } - - current_chunk_p->items[current_chunk_index] = ecma_make_collection_chunk_value (NULL); return header_p; } /* ecma_new_values_collection */ @@ -102,8 +54,7 @@ ecma_new_values_collection (const ecma_value_t values_buffer[], /**< ecma values */ void ecma_free_values_collection (ecma_collection_header_t *header_p, /**< collection's header */ - bool do_deref_if_object) /**< if the value is object value, - decrement reference counter of the object */ + uint32_t flags) /**< combination of ecma_collection_flag_t flags */ { ecma_collection_chunk_t *chunk_p = ECMA_GET_POINTER (ecma_collection_chunk_t, header_p->first_chunk_cp); @@ -123,14 +74,11 @@ ecma_free_values_collection (ecma_collection_header_t *header_p, /**< collection do { - if (do_deref_if_object) + if (!ecma_is_value_object (*item_p) + || !(flags & ECMA_COLLECTION_NO_REF_OBJECTS)) { ecma_free_value (*item_p); } - else - { - ecma_free_value_if_not_object (*item_p); - } item_p++; } @@ -151,8 +99,7 @@ ecma_free_values_collection (ecma_collection_header_t *header_p, /**< collection void ecma_append_to_values_collection (ecma_collection_header_t *header_p, /**< collection's header */ ecma_value_t value, /**< ecma value to append */ - bool do_ref_if_object) /**< if the value is object value, - increase reference counter of the object */ + uint32_t flags) /**< combination of ecma_collection_flag_t flags */ { ecma_length_t item_index; ecma_collection_chunk_t *chunk_p; @@ -192,7 +139,8 @@ ecma_append_to_values_collection (ecma_collection_header_t *header_p, /**< colle } } - if (do_ref_if_object || !ecma_is_value_object (value)) + if (!ecma_is_value_object (value) + || !(flags & ECMA_COLLECTION_NO_REF_OBJECTS)) { value = ecma_copy_value (value); } diff --git a/jerry-core/ecma/base/ecma-helpers.h b/jerry-core/ecma/base/ecma-helpers.h index 7c888f226..9fdf55070 100644 --- a/jerry-core/ecma/base/ecma-helpers.h +++ b/jerry-core/ecma/base/ecma-helpers.h @@ -285,10 +285,9 @@ lit_utf8_size_t ecma_number_to_binary_floating_point_number (ecma_number_t num, int32_t *out_decimal_exp_p); /* ecma-helpers-values-collection.c */ -ecma_collection_header_t *ecma_new_values_collection (const ecma_value_t values_buffer[], ecma_length_t values_number, - bool do_ref_if_object); -void ecma_free_values_collection (ecma_collection_header_t *header_p, bool do_deref_if_object); -void ecma_append_to_values_collection (ecma_collection_header_t *header_p, ecma_value_t v, bool do_ref_if_object); +ecma_collection_header_t *ecma_new_values_collection (void); +void ecma_free_values_collection (ecma_collection_header_t *header_p, uint32_t flags); +void ecma_append_to_values_collection (ecma_collection_header_t *header_p, ecma_value_t v, uint32_t flags); ecma_value_t * ecma_collection_iterator_init (ecma_collection_header_t *header_p); diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c index 0c3283664..8f1c0cccf 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c @@ -1276,7 +1276,7 @@ ecma_builtin_array_prototype_object_sort (ecma_value_t this_arg, /**< this argum } } - ecma_free_values_collection (array_index_props_p, true); + ecma_free_values_collection (array_index_props_p, 0); if (ecma_is_value_empty (ret_value)) { diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c index 6159ba476..ca430d3d0 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c @@ -226,7 +226,7 @@ ecma_builtin_helper_object_get_properties (ecma_object_t *obj_p, /**< object */ index++; } - ecma_free_values_collection (props_p, true); + ecma_free_values_collection (props_p, 0); return new_array; } /* ecma_builtin_helper_object_get_properties */ diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-json.c b/jerry-core/ecma/builtin-objects/ecma-builtin-json.c index 0e0112798..ec89bcc06 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-json.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-json.c @@ -767,7 +767,7 @@ ecma_builtin_json_walk (ecma_object_t *reviver_p, /**< reviver function */ ECMA_FINALIZE (value_walk); } - ecma_free_values_collection (props_p, true); + ecma_free_values_collection (props_p, 0); } if (ecma_is_value_empty (ret_value)) @@ -911,7 +911,7 @@ ecma_builtin_json_stringify (ecma_value_t this_arg, /**< 'this' argument */ context.indent_str_p = ecma_get_magic_string (LIT_MAGIC_STRING__EMPTY); /* 3. */ - context.property_list_p = ecma_new_values_collection (NULL, 0, false); + context.property_list_p = ecma_new_values_collection (); context.replacer_function_p = NULL; @@ -991,7 +991,7 @@ ecma_builtin_json_stringify (ecma_value_t this_arg, /**< 'this' argument */ { if (!ecma_has_string_value_in_collection (context.property_list_p, item)) { - ecma_append_to_values_collection (context.property_list_p, item, true); + ecma_append_to_values_collection (context.property_list_p, item, 0); ecma_deref_ecma_string (ecma_get_string_from_value (item)); } else @@ -1141,7 +1141,7 @@ ecma_builtin_json_stringify (ecma_value_t this_arg, /**< 'this' argument */ ecma_deref_ecma_string (context.indent_str_p); - ecma_free_values_collection (context.property_list_p, true); + ecma_free_values_collection (context.property_list_p, 0); return ret_value; } /* ecma_builtin_json_stringify */ @@ -1493,7 +1493,7 @@ ecma_builtin_json_object (ecma_object_t *obj_p, /**< the object*/ /* 6. */ else { - property_keys_p = ecma_new_values_collection (NULL, 0, true); + property_keys_p = ecma_new_values_collection (); ecma_collection_header_t *props_p = ecma_op_object_get_property_names (obj_p, false, true, false); @@ -1512,17 +1512,17 @@ ecma_builtin_json_object (ecma_object_t *obj_p, /**< the object*/ if (ECMA_PROPERTY_GET_TYPE (property) == ECMA_PROPERTY_TYPE_NAMEDDATA) { - ecma_append_to_values_collection (property_keys_p, *ecma_value_p, true); + ecma_append_to_values_collection (property_keys_p, *ecma_value_p, 0); } ecma_value_p = ecma_collection_iterator_next (ecma_value_p); } - ecma_free_values_collection (props_p, true); + ecma_free_values_collection (props_p, 0); } /* 7. */ - ecma_collection_header_t *partial_p = ecma_new_values_collection (NULL, 0, true); + ecma_collection_header_t *partial_p = ecma_new_values_collection (); /* 8. */ ecma_value_t *ecma_value_p = ecma_collection_iterator_init (property_keys_p); @@ -1562,7 +1562,7 @@ ecma_builtin_json_object (ecma_object_t *obj_p, /**< the object*/ /* 8.b.v */ ecma_value_t member_value = ecma_make_string_value (member_str_p); - ecma_append_to_values_collection (partial_p, member_value, true); + ecma_append_to_values_collection (partial_p, member_value, 0); ecma_deref_ecma_string (member_str_p); } @@ -1571,12 +1571,12 @@ ecma_builtin_json_object (ecma_object_t *obj_p, /**< the object*/ if (context_p->property_list_p->item_count == 0) { - ecma_free_values_collection (property_keys_p, true); + ecma_free_values_collection (property_keys_p, 0); } if (!ecma_is_value_empty (ret_value)) { - ecma_free_values_collection (partial_p, true); + ecma_free_values_collection (partial_p, 0); ecma_deref_ecma_string (stepback_p); return ret_value; } @@ -1610,7 +1610,7 @@ ecma_builtin_json_object (ecma_object_t *obj_p, /**< the object*/ } } - ecma_free_values_collection (partial_p, true); + ecma_free_values_collection (partial_p, 0); /* 11. */ context_p->occurence_stack_last_p = stack_item.next_p; @@ -1658,7 +1658,7 @@ ecma_builtin_json_array (ecma_object_t *obj_p, /**< the array object*/ context_p->indent_str_p = ecma_concat_ecma_strings (stepback_p, context_p->gap_str_p); /* 5. */ - ecma_collection_header_t *partial_p = ecma_new_values_collection (NULL, 0, true); + ecma_collection_header_t *partial_p = ecma_new_values_collection (); /* 6. */ ECMA_TRY_CATCH (array_length, @@ -1686,13 +1686,13 @@ ecma_builtin_json_array (ecma_object_t *obj_p, /**< the array object*/ if (ecma_is_value_undefined (str_val)) { ecma_string_t *null_str_p = ecma_get_magic_string (LIT_MAGIC_STRING_NULL); - ecma_append_to_values_collection (partial_p, ecma_make_string_value (null_str_p), true); + ecma_append_to_values_collection (partial_p, ecma_make_string_value (null_str_p), 0); ecma_deref_ecma_string (null_str_p); } /* 8.c */ else { - ecma_append_to_values_collection (partial_p, str_val, true); + ecma_append_to_values_collection (partial_p, str_val, 0); } ECMA_FINALIZE (str_val); @@ -1734,7 +1734,7 @@ ecma_builtin_json_array (ecma_object_t *obj_p, /**< the array object*/ ECMA_OP_TO_NUMBER_FINALIZE (array_length_num); ECMA_FINALIZE (array_length); - ecma_free_values_collection (partial_p, true); + ecma_free_values_collection (partial_p, 0); /* 11. */ context_p->occurence_stack_last_p = stack_item.next_p; diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object.c b/jerry-core/ecma/builtin-objects/ecma-builtin-object.c index 4a7cb7f93..6355239e3 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-object.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-object.c @@ -345,7 +345,7 @@ ecma_builtin_object_object_seal (ecma_value_t this_arg, /**< 'this' argument */ ecma_free_property_descriptor (&prop_desc); } - ecma_free_values_collection (props_p, true); + ecma_free_values_collection (props_p, 0); if (ecma_is_value_empty (ret_value)) { @@ -424,7 +424,7 @@ ecma_builtin_object_object_freeze (ecma_value_t this_arg, /**< 'this' argument * ecma_free_property_descriptor (&prop_desc); } - ecma_free_values_collection (props_p, true); + ecma_free_values_collection (props_p, 0); if (ecma_is_value_empty (ret_value)) { @@ -531,7 +531,7 @@ ecma_builtin_object_object_is_sealed (ecma_value_t this_arg, /**< 'this' argumen } } - ecma_free_values_collection (props_p, true); + ecma_free_values_collection (props_p, 0); } /* 4. */ @@ -609,7 +609,7 @@ ecma_builtin_object_object_is_frozen (ecma_value_t this_arg, /**< 'this' argumen } } - ecma_free_values_collection (props_p, true); + ecma_free_values_collection (props_p, 0); } /* 4 */ @@ -885,7 +885,7 @@ ecma_builtin_object_object_define_properties (ecma_value_t this_arg, /**< 'this' JMEM_FINALIZE_LOCAL_ARRAY (property_descriptors); - ecma_free_values_collection (prop_names_p, true); + ecma_free_values_collection (prop_names_p, 0); /* 7. */ if (ecma_is_value_empty (ret_value)) diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins.c b/jerry-core/ecma/builtin-objects/ecma-builtins.c index c4a1e182b..6b9ffc65c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtins.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtins.c @@ -719,7 +719,7 @@ ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in /* 'length' property is non-enumerable (ECMA-262 v5, 15) */ ecma_string_t *name_p = ecma_new_ecma_length_string (); - ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), true); + ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), 0); ecma_deref_ecma_string (name_p); } else @@ -765,7 +765,7 @@ ecma_builtin_list_lazy_property_names (ecma_object_t *object_p, /**< a built-in { ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), - true); + 0); } ecma_deref_ecma_string (name_p); diff --git a/jerry-core/ecma/operations/ecma-array-object.c b/jerry-core/ecma/operations/ecma-array-object.c index 298bfec0a..d50301ad5 100644 --- a/jerry-core/ecma/operations/ecma-array-object.c +++ b/jerry-core/ecma/operations/ecma-array-object.c @@ -354,7 +354,7 @@ ecma_op_array_list_lazy_property_names (ecma_object_t *obj_p, /**< a String obje ecma_collection_header_t *for_non_enumerable_p = separate_enumerable ? non_enum_collection_p : main_collection_p; ecma_string_t *length_str_p = ecma_new_ecma_length_string (); - ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (length_str_p), true); + ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (length_str_p), 0); ecma_deref_ecma_string (length_str_p); } /* ecma_op_array_list_lazy_property_names */ diff --git a/jerry-core/ecma/operations/ecma-function-object.c b/jerry-core/ecma/operations/ecma-function-object.c index d073c0911..72f5aa83b 100644 --- a/jerry-core/ecma/operations/ecma-function-object.c +++ b/jerry-core/ecma/operations/ecma-function-object.c @@ -954,12 +954,12 @@ ecma_op_function_list_lazy_property_names (ecma_object_t *object_p, /**< functio /* 'length' property is non-enumerable (ECMA-262 v5, 13.2.5) */ ecma_string_t *name_p = ecma_new_ecma_length_string (); - ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), true); + ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), 0); ecma_deref_ecma_string (name_p); /* 'prototype' property is non-enumerable (ECMA-262 v5, 13.2.18) */ name_p = ecma_get_magic_string (LIT_MAGIC_STRING_PROTOTYPE); - ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), true); + ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), 0); ecma_deref_ecma_string (name_p); ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p; @@ -972,12 +972,12 @@ ecma_op_function_list_lazy_property_names (ecma_object_t *object_p, /**< functio { /* 'caller' property is non-enumerable (ECMA-262 v5, 13.2.5) */ name_p = ecma_get_magic_string (LIT_MAGIC_STRING_CALLER); - ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), true); + ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), 0); ecma_deref_ecma_string (name_p); /* 'arguments' property is non-enumerable (ECMA-262 v5, 13.2.5) */ name_p = ecma_get_magic_string (LIT_MAGIC_STRING_ARGUMENTS); - ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), true); + ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), 0); ecma_deref_ecma_string (name_p); } } /* ecma_op_function_list_lazy_property_names */ @@ -1009,7 +1009,7 @@ ecma_op_external_function_list_lazy_property_names (bool separate_enumerable, /* /* 'prototype' property is non-enumerable (ECMA-262 v5, 13.2.18) */ ecma_string_t *name_p = ecma_get_magic_string (LIT_MAGIC_STRING_PROTOTYPE); - ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), true); + ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), 0); ecma_deref_ecma_string (name_p); } /* ecma_op_external_function_list_lazy_property_names */ @@ -1041,17 +1041,17 @@ ecma_op_bound_function_list_lazy_property_names (bool separate_enumerable, /**< /* 'length' property is non-enumerable (ECMA-262 v5, 13.2.5) */ ecma_string_t *name_p = ecma_new_ecma_length_string (); - ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), true); + ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), 0); ecma_deref_ecma_string (name_p); /* 'caller' property is non-enumerable (ECMA-262 v5, 13.2.5) */ name_p = ecma_get_magic_string (LIT_MAGIC_STRING_CALLER); - ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), true); + ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), 0); ecma_deref_ecma_string (name_p); /* 'arguments' property is non-enumerable (ECMA-262 v5, 13.2.5) */ name_p = ecma_get_magic_string (LIT_MAGIC_STRING_ARGUMENTS); - ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), true); + ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (name_p), 0); ecma_deref_ecma_string (name_p); } /* ecma_op_bound_function_list_lazy_property_names */ diff --git a/jerry-core/ecma/operations/ecma-objects.c b/jerry-core/ecma/operations/ecma-objects.c index 35241bce5..cd296f8d6 100644 --- a/jerry-core/ecma/operations/ecma-objects.c +++ b/jerry-core/ecma/operations/ecma-objects.c @@ -1381,8 +1381,8 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ JERRY_ASSERT (obj_p != NULL && !ecma_is_lexical_environment (obj_p)); - ecma_collection_header_t *ret_p = ecma_new_values_collection (NULL, 0, false); - ecma_collection_header_t *skipped_non_enumerable_p = ecma_new_values_collection (NULL, 0, false); + ecma_collection_header_t *ret_p = ecma_new_values_collection (); + ecma_collection_header_t *skipped_non_enumerable_p = ecma_new_values_collection (); const ecma_object_type_t type = ecma_get_object_type (obj_p); const bool obj_is_builtin = ecma_get_object_is_builtin (obj_p); @@ -1400,7 +1400,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ ecma_length_t string_named_properties_count = 0; ecma_length_t array_index_named_properties_count = 0; - ecma_collection_header_t *prop_names_p = ecma_new_values_collection (NULL, 0, false); + ecma_collection_header_t *prop_names_p = ecma_new_values_collection (); if (obj_is_builtin) { @@ -1564,7 +1564,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ ecma_append_to_values_collection (prop_names_p, ecma_make_string_value (name_p), - true); + 0); } } else @@ -1573,7 +1573,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ ecma_append_to_values_collection (skipped_non_enumerable_p, ecma_make_string_value (name_p), - true); + 0); } ecma_deref_ecma_string (name_p); @@ -1679,7 +1679,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ JMEM_FINALIZE_LOCAL_ARRAY (array_index_names_p); - ecma_free_values_collection (prop_names_p, true); + ecma_free_values_collection (prop_names_p, 0); /* Third pass: * embedding own property names of current object of prototype chain to aggregate property names collection */ @@ -1739,7 +1739,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ { JERRY_ASSERT ((names_hashes_bitmap[bitmap_row] & (1u << bitmap_column)) != 0); - ecma_append_to_values_collection (ret_p, ecma_make_string_value (names_p[i]), true); + ecma_append_to_values_collection (ret_p, ecma_make_string_value (names_p[i]), 0); } ecma_deref_ecma_string (name_p); @@ -1748,7 +1748,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */ JMEM_FINALIZE_LOCAL_ARRAY (names_p); } - ecma_free_values_collection (skipped_non_enumerable_p, true); + ecma_free_values_collection (skipped_non_enumerable_p, 0); return ret_p; } /* ecma_op_object_get_property_names */ diff --git a/jerry-core/ecma/operations/ecma-promise-object.c b/jerry-core/ecma/operations/ecma-promise-object.c index e09c03019..161e7403c 100644 --- a/jerry-core/ecma/operations/ecma-promise-object.c +++ b/jerry-core/ecma/operations/ecma-promise-object.c @@ -156,7 +156,7 @@ ecma_promise_trigger_reactions (ecma_collection_header_t *reactions, /**< lists ecma_value_p = ecma_collection_iterator_next (ecma_value_p); } - ecma_free_values_collection (reactions, false); + ecma_free_values_collection (reactions, ECMA_COLLECTION_NO_REF_OBJECTS); } /* ecma_promise_trigger_reactions */ /** @@ -180,11 +180,11 @@ ecma_reject_promise (ecma_value_t promise, /**< promise */ first and creating a new one might cause a heap after use event. */ ecma_collection_header_t *reject_reactions = promise_p->reject_reactions; ecma_collection_header_t *fulfill_reactions = promise_p->fulfill_reactions; - promise_p->reject_reactions = ecma_new_values_collection (NULL, 0, false); - promise_p->fulfill_reactions = ecma_new_values_collection (NULL, 0, false); + promise_p->reject_reactions = ecma_new_values_collection (); + promise_p->fulfill_reactions = ecma_new_values_collection (); /* Fulfill reactions will never be triggered. */ - ecma_free_values_collection (fulfill_reactions, false); + ecma_free_values_collection (fulfill_reactions, ECMA_COLLECTION_NO_REF_OBJECTS); ecma_promise_trigger_reactions (reject_reactions, reason); } /* ecma_reject_promise */ @@ -209,11 +209,11 @@ ecma_fulfill_promise (ecma_value_t promise, /**< promise */ first and creating a new one might cause a heap after use event. */ ecma_collection_header_t *reject_reactions = promise_p->reject_reactions; ecma_collection_header_t *fulfill_reactions = promise_p->fulfill_reactions; - promise_p->reject_reactions = ecma_new_values_collection (NULL, 0, false); - promise_p->fulfill_reactions = ecma_new_values_collection (NULL, 0, false); + promise_p->reject_reactions = ecma_new_values_collection (); + promise_p->fulfill_reactions = ecma_new_values_collection (); /* Reject reactions will never be triggered. */ - ecma_free_values_collection (reject_reactions, false); + ecma_free_values_collection (reject_reactions, ECMA_COLLECTION_NO_REF_OBJECTS); ecma_promise_trigger_reactions (fulfill_reactions, value); } /* ecma_fulfill_promise */ @@ -511,8 +511,8 @@ ecma_op_create_promise_object (ecma_value_t executor, /**< the executor function /* 5 */ ecma_promise_set_state (object_p, ECMA_PROMISE_STATE_PENDING); /* 6-7. */ - promise_object_p->fulfill_reactions = ecma_new_values_collection (NULL, 0, false); - promise_object_p->reject_reactions = ecma_new_values_collection (NULL, 0, false); + promise_object_p->fulfill_reactions = ecma_new_values_collection (); + promise_object_p->reject_reactions = ecma_new_values_collection (); /* 8. */ ecma_promise_resolving_functions_t *funcs = ecma_promise_create_resolving_functions (object_p); @@ -719,11 +719,11 @@ ecma_promise_do_then (ecma_value_t promise, /**< the promise which call 'then' * /* 7. */ ecma_append_to_values_collection (promise_p->fulfill_reactions, ecma_make_object_value (fulfill_reaction_p), - false); + ECMA_COLLECTION_NO_REF_OBJECTS); ecma_append_to_values_collection (promise_p->reject_reactions, ecma_make_object_value (reject_reaction_p), - false); + ECMA_COLLECTION_NO_REF_OBJECTS); } else if (ecma_promise_get_state (obj_p) == ECMA_PROMISE_STATE_FULFILLED) { diff --git a/jerry-core/ecma/operations/ecma-string-object.c b/jerry-core/ecma/operations/ecma-string-object.c index 207a370e0..46b5b9f73 100644 --- a/jerry-core/ecma/operations/ecma-string-object.c +++ b/jerry-core/ecma/operations/ecma-string-object.c @@ -126,13 +126,13 @@ ecma_op_string_list_lazy_property_names (ecma_object_t *obj_p, /**< a String obj ecma_string_t *name_p = ecma_new_ecma_string_from_uint32 (i); /* the properties are enumerable (ECMA-262 v5, 15.5.5.2.9) */ - ecma_append_to_values_collection (for_enumerable_p, ecma_make_string_value (name_p), true); + ecma_append_to_values_collection (for_enumerable_p, ecma_make_string_value (name_p), 0); ecma_deref_ecma_string (name_p); } ecma_string_t *length_str_p = ecma_new_ecma_length_string (); - ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (length_str_p), true); + ecma_append_to_values_collection (for_non_enumerable_p, ecma_make_string_value (length_str_p), 0); ecma_deref_ecma_string (length_str_p); } /* ecma_op_string_list_lazy_property_names */ diff --git a/jerry-core/ecma/operations/ecma-typedarray-object.c b/jerry-core/ecma/operations/ecma-typedarray-object.c index f3f3921a1..0dce329b4 100644 --- a/jerry-core/ecma/operations/ecma-typedarray-object.c +++ b/jerry-core/ecma/operations/ecma-typedarray-object.c @@ -777,7 +777,7 @@ ecma_op_typedarray_list_lazy_property_names (ecma_object_t *obj_p, /**< a TypedA { ecma_string_t *name_p = ecma_new_ecma_string_from_uint32 (i); - ecma_append_to_values_collection (main_collection_p, ecma_make_string_value (name_p), true); + ecma_append_to_values_collection (main_collection_p, ecma_make_string_value (name_p), 0); ecma_deref_ecma_string (name_p); }