From 7f5c1517205088c95c80c5c1e0d8e3d485877765 Mon Sep 17 00:00:00 2001 From: Daniella Barsony Date: Mon, 5 Mar 2018 10:48:39 +0100 Subject: [PATCH] Remove ecma_get_length_string Fixes #2231 JerryScript-DCO-1.0-Signed-off-by: Daniella Barsony bella@inf.u-szeged.hu --- jerry-core/ecma/base/ecma-helpers-string.c | 14 -------------- jerry-core/ecma/base/ecma-helpers.h | 1 - .../builtin-objects/ecma-builtin-array-prototype.c | 2 +- .../ecma/operations/ecma-objects-arguments.c | 2 +- jerry-core/ecma/operations/ecma-regexp-object.c | 2 +- 5 files changed, 3 insertions(+), 18 deletions(-) diff --git a/jerry-core/ecma/base/ecma-helpers-string.c b/jerry-core/ecma/base/ecma-helpers-string.c index 2823a16a3b..b22a5248f4 100644 --- a/jerry-core/ecma/base/ecma-helpers-string.c +++ b/jerry-core/ecma/base/ecma-helpers-string.c @@ -512,20 +512,6 @@ ecma_new_ecma_string_from_magic_string_ex_id (lit_magic_string_ex_id_t id) /**< return string_desc_p; } /* ecma_new_ecma_string_from_magic_string_ex_id */ -/** - * Returns the constant assigned to the length magic string. - * - * Note: - * Calling ecma_deref_ecma_string on the returned pointer is optional. - * - * @return pointer to ecma-string descriptor - */ -ecma_string_t * -ecma_get_length_string (void) -{ - return ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH); -} /* ecma_get_length_string */ - /** * Append a cesu8 string after an ecma-string * diff --git a/jerry-core/ecma/base/ecma-helpers.h b/jerry-core/ecma/base/ecma-helpers.h index 8ac4555fb9..250abe9ac7 100644 --- a/jerry-core/ecma/base/ecma-helpers.h +++ b/jerry-core/ecma/base/ecma-helpers.h @@ -200,7 +200,6 @@ ecma_string_t *ecma_get_ecma_string_from_uint32 (uint32_t uint32_number); ecma_string_t *ecma_new_ecma_string_from_number (ecma_number_t num); ecma_string_t *ecma_get_magic_string (lit_magic_string_id_t id); ecma_string_t *ecma_new_ecma_string_from_magic_string_ex_id (lit_magic_string_ex_id_t id); -ecma_string_t *ecma_get_length_string (void); ecma_string_t *ecma_append_chars_to_string (ecma_string_t *string1_p, const lit_utf8_byte_t *cesu8_string2_p, lit_utf8_size_t cesu8_string2_size, 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 b94e321003..8cc2503c3c 100644 --- a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c +++ b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c @@ -62,7 +62,7 @@ ecma_builtin_array_prototype_helper_set_length (ecma_object_t *object, /**< obje ecma_value_t length_value = ecma_make_number_value (length); ret_value = ecma_op_object_put (object, - ecma_get_length_string (), + ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH), length_value, true), diff --git a/jerry-core/ecma/operations/ecma-objects-arguments.c b/jerry-core/ecma/operations/ecma-objects-arguments.c index 3080f7bd3e..0318626035 100644 --- a/jerry-core/ecma/operations/ecma-objects-arguments.c +++ b/jerry-core/ecma/operations/ecma-objects-arguments.c @@ -133,7 +133,7 @@ ecma_op_create_arguments_object (ecma_object_t *func_obj_p, /**< callee function /* 7. */ prop_value_p = ecma_create_named_data_property (obj_p, - ecma_get_length_string (), + ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH), ECMA_PROPERTY_CONFIGURABLE_WRITABLE, NULL); diff --git a/jerry-core/ecma/operations/ecma-regexp-object.c b/jerry-core/ecma/operations/ecma-regexp-object.c index 61713cba7e..6ab090927b 100644 --- a/jerry-core/ecma/operations/ecma-regexp-object.c +++ b/jerry-core/ecma/operations/ecma-regexp-object.c @@ -1185,7 +1185,7 @@ re_set_result_array_properties (ecma_object_t *array_obj_p, /**< result array */ array_item_prop_desc.value = ecma_make_uint32_value (num_of_elements); ecma_op_object_define_own_property (array_obj_p, - ecma_get_length_string (), + ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH), &array_item_prop_desc, true); }