Skip to content

Commit 58c568a

Browse files
akosthekissyichoi
authored andcommitted
Revisit unused global functions in jerry-core (#2450)
There are some leftover global functions in the code that are not referenced at all anymore. These functions are removed by this patch. There are also some global functions that are only used in their own modules. These functions are made static by this patch. JerryScript-DCO-1.0-Signed-off-by: Akos Kiss [email protected]
1 parent 47087de commit 58c568a

21 files changed

+204
-293
lines changed

jerry-core/ecma/base/ecma-alloc.c

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -184,35 +184,6 @@ ecma_dealloc_string_buffer (ecma_string_t *string_p, /**< string with data */
184184
jmem_heap_free_block (string_p, size);
185185
} /* ecma_dealloc_string_buffer */
186186

187-
/**
188-
* Allocate memory for getter-setter pointer pair
189-
*
190-
* @return pointer to allocated memory
191-
*/
192-
inline ecma_getter_setter_pointers_t * JERRY_ATTR_ALWAYS_INLINE
193-
ecma_alloc_getter_setter_pointers (void)
194-
{
195-
#ifdef JMEM_STATS
196-
jmem_stats_allocate_property_bytes (sizeof (ecma_property_pair_t));
197-
#endif /* JMEM_STATS */
198-
199-
return (ecma_getter_setter_pointers_t *) jmem_pools_alloc (sizeof (ecma_getter_setter_pointers_t));
200-
} /* ecma_alloc_getter_setter_pointers */
201-
202-
/**
203-
* Dealloc memory from getter-setter pointer pair
204-
*/
205-
inline void JERRY_ATTR_ALWAYS_INLINE
206-
ecma_dealloc_getter_setter_pointers (ecma_getter_setter_pointers_t *getter_setter_pointers_p) /**< pointer pair
207-
* to be freed */
208-
{
209-
#ifdef JMEM_STATS
210-
jmem_stats_free_property_bytes (sizeof (ecma_property_pair_t));
211-
#endif /* JMEM_STATS */
212-
213-
jmem_pools_free (getter_setter_pointers_p, sizeof (ecma_getter_setter_pointers_t));
214-
} /* ecma_dealloc_getter_setter_pointers */
215-
216187
/**
217188
* Allocate memory for ecma-property pair
218189
*

jerry-core/ecma/base/ecma-alloc.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,6 @@ ecma_string_t *ecma_alloc_string_buffer (size_t size);
8585
*/
8686
void ecma_dealloc_string_buffer (ecma_string_t *string_p, size_t size);
8787

88-
/**
89-
* Allocate memory for getter-setter pointer pair
90-
*
91-
* @return pointer to allocated memory
92-
*/
93-
ecma_getter_setter_pointers_t *ecma_alloc_getter_setter_pointers (void);
94-
95-
/**
96-
* Dealloc memory from getter-setter pointer pair
97-
*/
98-
void ecma_dealloc_getter_setter_pointers (ecma_getter_setter_pointers_t *getter_setter_pointers_p);
99-
10088
/**
10189
* Allocate memory for ecma-property pair
10290
*

jerry-core/ecma/base/ecma-helpers-number.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ ecma_number_is_infinity (ecma_number_t num) /**< ecma-number */
351351
*
352352
* @return shift of dot in the fraction
353353
*/
354-
int32_t
354+
static int32_t
355355
ecma_number_get_fraction_and_exponent (ecma_number_t num, /**< ecma-number */
356356
uint64_t *out_fraction_p, /**< [out] fraction of the number */
357357
int32_t *out_exponent_p) /**< [out] exponent of the number */
@@ -410,7 +410,7 @@ ecma_number_get_fraction_and_exponent (ecma_number_t num, /**< ecma-number */
410410
*
411411
* @return ecma-number
412412
*/
413-
ecma_number_t
413+
static ecma_number_t
414414
ecma_number_make_normal_positive_from_fraction_and_exponent (uint64_t fraction, /**< fraction */
415415
int32_t exponent) /**< exponent */
416416
{

jerry-core/ecma/base/ecma-helpers-string.c

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,30 @@ ecma_string_get_chars_fast (const ecma_string_t *string_p, /**< ecma-string */
175175
}
176176
} /* ecma_string_get_chars_fast */
177177

178+
/**
179+
* Allocate new ecma-string and fill it with reference to ECMA magic string
180+
*
181+
* @return pointer to ecma-string descriptor
182+
*/
183+
static ecma_string_t *
184+
ecma_new_ecma_string_from_magic_string_ex_id (lit_magic_string_ex_id_t id) /**< identifier of externl magic string */
185+
{
186+
JERRY_ASSERT (id < lit_get_magic_string_ex_count ());
187+
188+
if (JERRY_LIKELY (id <= ECMA_DIRECT_STRING_MAX_IMM))
189+
{
190+
return (ecma_string_t *) ECMA_CREATE_DIRECT_STRING (ECMA_DIRECT_STRING_MAGIC_EX, (uintptr_t) id);
191+
}
192+
193+
ecma_string_t *string_desc_p = ecma_alloc_string ();
194+
195+
string_desc_p->refs_and_container = ECMA_STRING_CONTAINER_MAGIC_STRING_EX | ECMA_STRING_REF_ONE;
196+
string_desc_p->hash = (lit_string_hash_t) (LIT_MAGIC_STRING__COUNT + id);
197+
string_desc_p->u.magic_string_ex_id = id;
198+
199+
return string_desc_p;
200+
} /* ecma_new_ecma_string_from_magic_string_ex_id */
201+
178202
/**
179203
* Allocate new ecma-string and fill it with characters from the utf8 string
180204
*
@@ -480,30 +504,6 @@ ecma_get_magic_string (lit_magic_string_id_t id) /**< identifier of magic string
480504
return (ecma_string_t *) ECMA_CREATE_DIRECT_STRING (ECMA_DIRECT_STRING_MAGIC, (uintptr_t) id);
481505
} /* ecma_get_magic_string */
482506

483-
/**
484-
* Allocate new ecma-string and fill it with reference to ECMA magic string
485-
*
486-
* @return pointer to ecma-string descriptor
487-
*/
488-
ecma_string_t *
489-
ecma_new_ecma_string_from_magic_string_ex_id (lit_magic_string_ex_id_t id) /**< identifier of externl magic string */
490-
{
491-
JERRY_ASSERT (id < lit_get_magic_string_ex_count ());
492-
493-
if (JERRY_LIKELY (id <= ECMA_DIRECT_STRING_MAX_IMM))
494-
{
495-
return (ecma_string_t *) ECMA_CREATE_DIRECT_STRING (ECMA_DIRECT_STRING_MAGIC_EX, (uintptr_t) id);
496-
}
497-
498-
ecma_string_t *string_desc_p = ecma_alloc_string ();
499-
500-
string_desc_p->refs_and_container = ECMA_STRING_CONTAINER_MAGIC_STRING_EX | ECMA_STRING_REF_ONE;
501-
string_desc_p->hash = (lit_string_hash_t) (LIT_MAGIC_STRING__COUNT + id);
502-
string_desc_p->u.magic_string_ex_id = id;
503-
504-
return string_desc_p;
505-
} /* ecma_new_ecma_string_from_magic_string_ex_id */
506-
507507
/**
508508
* Append a cesu8 string after an ecma-string
509509
*

jerry-core/ecma/base/ecma-helpers.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ ecma_string_t *ecma_new_ecma_string_from_uint32 (uint32_t uint32_number);
200200
ecma_string_t *ecma_get_ecma_string_from_uint32 (uint32_t uint32_number);
201201
ecma_string_t *ecma_new_ecma_string_from_number (ecma_number_t num);
202202
ecma_string_t *ecma_get_magic_string (lit_magic_string_id_t id);
203-
ecma_string_t *ecma_new_ecma_string_from_magic_string_ex_id (lit_magic_string_ex_id_t id);
204203
ecma_string_t *ecma_append_chars_to_string (ecma_string_t *string1_p,
205204
const lit_utf8_byte_t *cesu8_string2_p,
206205
lit_utf8_size_t cesu8_string2_size,
@@ -268,10 +267,6 @@ bool ecma_number_is_nan (ecma_number_t num);
268267
bool ecma_number_is_negative (ecma_number_t num);
269268
bool ecma_number_is_zero (ecma_number_t num);
270269
bool ecma_number_is_infinity (ecma_number_t num);
271-
int32_t
272-
ecma_number_get_fraction_and_exponent (ecma_number_t num, uint64_t *out_fraction_p, int32_t *out_exponent_p);
273-
ecma_number_t
274-
ecma_number_make_normal_positive_from_fraction_and_exponent (uint64_t fraction, int32_t exponent);
275270
ecma_number_t
276271
ecma_number_make_from_sign_mantissa_and_exponent (bool sign, uint64_t mantissa, int32_t exponent);
277272
ecma_number_t ecma_number_get_prev (ecma_number_t num);

jerry-core/ecma/builtin-objects/ecma-builtin-helpers-json.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ecma_has_string_value_in_collection (ecma_collection_header_t *collection_p, /**
100100
* @return pointer to ecma-string
101101
* Returned value must be freed with ecma_deref_ecma_string.
102102
*/
103-
ecma_string_t *
103+
static ecma_string_t *
104104
ecma_builtin_helper_json_create_separated_properties (ecma_collection_header_t *partial_p, /**< key-value pairs*/
105105
ecma_string_t *separator_p) /**< separator*/
106106
{

jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,6 @@ ecma_value_t ecma_builtin_json_string_from_object (const ecma_value_t arg1);
158158
bool ecma_json_has_object_in_stack (ecma_json_occurence_stack_item_t *stack_p, ecma_object_t *object_p);
159159
bool ecma_has_string_value_in_collection (ecma_collection_header_t *collection_p, ecma_value_t string_value);
160160

161-
ecma_string_t *
162-
ecma_builtin_helper_json_create_separated_properties (ecma_collection_header_t *partial_p, ecma_string_t *separator_p);
163161
ecma_value_t
164162
ecma_builtin_helper_json_create_formatted_json (lit_utf8_byte_t left_bracket, lit_utf8_byte_t right_bracket,
165163
ecma_string_t *stepback_p, ecma_collection_header_t *partial_p,

jerry-core/ecma/operations/ecma-exceptions.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ ecma_new_standard_error_with_message (ecma_standard_error_t error_type, /**< nat
218218
* @return ecma value
219219
* Returned value must be freed with ecma_free_value
220220
*/
221-
ecma_value_t
221+
static ecma_value_t
222222
ecma_raise_standard_error (ecma_standard_error_t error_type, /**< error type */
223223
const lit_utf8_byte_t *msg_p) /**< error message */
224224
{
@@ -343,20 +343,6 @@ ecma_raise_common_error (const char *msg_p) /**< error message */
343343
return ecma_raise_standard_error (ECMA_ERROR_COMMON, (const lit_utf8_byte_t *) msg_p);
344344
} /* ecma_raise_common_error */
345345

346-
/**
347-
* Raise an EvalError with the given message.
348-
*
349-
* See also: ECMA-262 v5, 15.11.6.1
350-
*
351-
* @return ecma value
352-
* Returned value must be freed with ecma_free_value
353-
*/
354-
ecma_value_t
355-
ecma_raise_eval_error (const char *msg_p) /**< error message */
356-
{
357-
return ecma_raise_standard_error (ECMA_ERROR_EVAL, (const lit_utf8_byte_t *) msg_p);
358-
} /* ecma_raise_eval_error */
359-
360346
/**
361347
* Raise a RangeError with the given message.
362348
*

jerry-core/ecma/operations/ecma-exceptions.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,10 @@ typedef enum
5353
ecma_standard_error_t ecma_get_error_type (ecma_object_t *error_object);
5454
ecma_object_t *ecma_new_standard_error (ecma_standard_error_t error_type);
5555
ecma_object_t *ecma_new_standard_error_with_message (ecma_standard_error_t error_type, ecma_string_t *message_string_p);
56-
ecma_value_t ecma_raise_standard_error (ecma_standard_error_t error_type, const lit_utf8_byte_t *msg_p);
5756
#ifdef JERRY_ENABLE_ERROR_MESSAGES
5857
ecma_value_t ecma_raise_standard_error_with_format (ecma_standard_error_t error_type, const char *msg_p, ...);
5958
#endif /* JERRY_ENABLE_ERROR_MESSAGES */
6059
ecma_value_t ecma_raise_common_error (const char *msg_p);
61-
ecma_value_t ecma_raise_eval_error (const char *msg_p);
6260
ecma_value_t ecma_raise_range_error (const char *msg_p);
6361
ecma_value_t ecma_raise_reference_error (const char *msg_p);
6462
ecma_value_t ecma_raise_syntax_error (const char *msg_p);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ ecma_op_object_get_own_property (ecma_object_t *object_p, /**< the object */
312312
* @return pointer to a property - if it exists,
313313
* NULL (i.e. ecma-undefined) - otherwise.
314314
*/
315-
ecma_property_t
315+
static ecma_property_t
316316
ecma_op_object_get_property (ecma_object_t *object_p, /**< the object */
317317
ecma_string_t *property_name_p, /**< property name */
318318
ecma_property_ref_t *property_ref_p, /**< property reference */

0 commit comments

Comments
 (0)