YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix evaluation order for binary operators (#4114)

Browse Source 
Furthermore fix toBoolean for BigInts as well.

JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
This commit is contained in:
Zoltan Herczeg
2020-08-07 14:32:46 +02:00
committed by GitHub
parent cb14682983
commit f4f9cde3e7
22 changed files with 211 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/base/ecma-helpers-number.c
+1 -1
View File
@@ -765,7 +765,7 @@ ecma_number_parse_int (const lit_utf8_byte_t *string_buff, /**< routine's first
/* 6. */
ecma_number_t radix_num;
radix = ecma_get_number (radix, &radix_num);
radix = ecma_op_to_numeric (radix, &radix_num, ECMA_TO_NUMERIC_NO_OPTS);
if (!ecma_is_value_empty (radix))
{
jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c
+1 -1
View File
@@ -1070,7 +1070,7 @@ ecma_builtin_array_prototype_object_sort_compare_helper (ecma_value_t lhs, /**<
{
ecma_number_t ret_num;
if (ECMA_IS_VALUE_ERROR (ecma_get_number (call_value, &ret_num)))
if (ECMA_IS_VALUE_ERROR (ecma_op_to_numeric (call_value, &ret_num, ECMA_TO_NUMERIC_NO_OPTS)))
{
ecma_free_value (call_value);
return ECMA_VALUE_ERROR;
jerry-core/ecma/builtin-objects/ecma-builtin-date.c
+1 -1
View File
@@ -213,7 +213,7 @@ ecma_date_construct_helper (const ecma_value_t *args, /**< arguments passed to t
/* 1-7. */
for (uint32_t i = 0; i < args_len; i++)
{
ecma_value_t status = ecma_get_number (args[i], date_nums + i);
ecma_value_t status = ecma_op_to_numeric (args[i], date_nums + i, ECMA_TO_NUMERIC_NO_OPTS);
if (ECMA_IS_VALUE_ERROR (status))
{
jerry-core/ecma/builtin-objects/ecma-builtin-global.c
+1 -1
View File
@@ -612,7 +612,7 @@ ecma_builtin_global_dispatch_routine (uint16_t builtin_routine_id, /**< built-in
{
ecma_number_t arg_num;
routine_arg_1 = ecma_get_number (routine_arg_1, &arg_num);
routine_arg_1 = ecma_op_to_numeric (routine_arg_1, &arg_num, ECMA_TO_NUMERIC_NO_OPTS);
if (!ecma_is_value_empty (routine_arg_1))
{
jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c
+1 -1
View File
@@ -539,7 +539,7 @@ ecma_builtin_helper_string_prototype_object_index_of (ecma_string_t *original_st
else
{
#endif /* ENABLED (JERRY_ESNEXT) */
ret_value = ecma_get_number (arg2, &pos_num);
ret_value = ecma_op_to_numeric (arg2, &pos_num, ECMA_TO_NUMERIC_NO_OPTS);
#if ENABLED (JERRY_ESNEXT)
}
#endif /* ENABLED (JERRY_ESNEXT) */
jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c
+1 -1
View File
@@ -784,7 +784,7 @@ ecma_builtin_string_prototype_object_split (ecma_value_t this_value, /**< this a
{
/* ECMA-262 v11, 21.1.3.20 6 */
ecma_number_t num;
if (ECMA_IS_VALUE_ERROR (ecma_get_number (limit_value, &num)))
if (ECMA_IS_VALUE_ERROR (ecma_op_to_numeric (limit_value, &num, ECMA_TO_NUMERIC_NO_OPTS)))
{
goto cleanup_string;
}
jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-prototype.c
+5 -5
View File
@@ -429,7 +429,7 @@ ecma_builtin_typedarray_prototype_map (ecma_value_t this_arg, /**< this argument
}
ecma_number_t mapped_num;
if (ECMA_IS_VALUE_ERROR (ecma_get_number (mapped_value, &mapped_num)))
if (ECMA_IS_VALUE_ERROR (ecma_op_to_numeric (mapped_value, &mapped_num, ECMA_TO_NUMERIC_NO_OPTS)))
{
ecma_free_value (mapped_value);
ecma_free_value (current_index);
@@ -949,7 +949,7 @@ ecma_builtin_typedarray_prototype_set (ecma_value_t this_arg, /**< this argument
ecma_number_t elem_num;
if (ECMA_IS_VALUE_ERROR (ecma_get_number (elem, &elem_num)))
if (ECMA_IS_VALUE_ERROR (ecma_op_to_numeric (elem, &elem_num, ECMA_TO_NUMERIC_NO_OPTS)))
{
ecma_free_value (elem);
ecma_deref_object (source_obj_p);
@@ -1059,7 +1059,7 @@ ecma_builtin_typedarray_prototype_join (ecma_value_t this_arg, /**< this argumen
ecma_number_t length_number;
if (ECMA_IS_VALUE_ERROR (ecma_get_number (length_value, &length_number)))
if (ECMA_IS_VALUE_ERROR (ecma_op_to_numeric (length_value, &length_number, ECMA_TO_NUMERIC_NO_OPTS)))
{
ecma_free_value (length_value);
ecma_free_value (obj_value);
@@ -1234,7 +1234,7 @@ ecma_builtin_typedarray_prototype_fill (ecma_value_t this_arg, /**< this argumen
}
ecma_number_t value_num;
ecma_value_t ret_value = ecma_get_number (value, &value_num);
ecma_value_t ret_value = ecma_op_to_numeric (value, &value_num, ECMA_TO_NUMERIC_NO_OPTS);
if (!ecma_is_value_empty (ret_value))
{
@@ -1355,7 +1355,7 @@ ecma_builtin_typedarray_prototype_sort_compare_helper (ecma_value_t lhs, /**< le
}
ecma_number_t ret_num;
ecma_value_t number_result = ecma_get_number (call_value, &ret_num);
ecma_value_t number_result = ecma_op_to_numeric (call_value, &ret_num, ECMA_TO_NUMERIC_NO_OPTS);
ecma_free_value (call_value);
jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray.c
+1 -1
View File
@@ -165,7 +165,7 @@ ecma_builtin_typedarray_of (ecma_value_t this_arg, /**< 'this' argument */
while (k < arguments_list_len)
{
ecma_number_t num;
ecma_value_t next_val = ecma_get_number (arguments_list_p[k], &num);
ecma_value_t next_val = ecma_op_to_numeric (arguments_list_p[k], &num, ECMA_TO_NUMERIC_NO_OPTS);
if (ECMA_IS_VALUE_ERROR (next_val))
{
jerry-core/ecma/operations/ecma-bigint.c
+40
View File
@@ -468,6 +468,46 @@ ecma_bigint_to_bigint (ecma_value_t value, /**< any value */
return result;
} /* ecma_bigint_to_bigint */
/**
* Returns with a BigInt if the value is BigInt,
* or the value is object, and its default value is BigInt
*
* @return ecma BigInt value or ECMA_VALUE_ERROR
* Returned value must be freed with ecma_free_value.
*/
ecma_value_t
ecma_bigint_get_bigint (ecma_value_t value, /**< any value */
bool *free_result_p) /**< [out] result should be freed */
{
*free_result_p = false;
if (ecma_is_value_bigint (value))
{
return value;
}
if (ecma_is_value_object (value))
{
ecma_object_t *object_p = ecma_get_object_from_value (value);
ecma_value_t default_value = ecma_op_object_default_value (object_p, ECMA_PREFERRED_TYPE_NUMBER);
if (ECMA_IS_VALUE_ERROR (default_value))
{
return default_value;
}
if (ecma_is_value_bigint (default_value))
{
*free_result_p = (default_value != ECMA_BIGINT_ZERO);
return default_value;
}
ecma_free_value (default_value);
}
return ecma_raise_type_error (ECMA_ERR_MSG ("Cannot convert a BigInt value to a number"));
} /* ecma_bigint_get_bigint */
/**
* Create BigInt value from uint64 digits
*
jerry-core/ecma/operations/ecma-bigint.h
+1
View File
@@ -43,6 +43,7 @@ ecma_value_t ecma_bigint_parse_string (const lit_utf8_byte_t *string_p, lit_utf8
ecma_value_t ecma_bigint_parse_string_value (ecma_value_t string, uint32_t options);
ecma_string_t *ecma_bigint_to_string (ecma_value_t value, ecma_bigint_digit_t radix);
ecma_value_t ecma_bigint_to_bigint (ecma_value_t value, bool allow_numbers);
ecma_value_t ecma_bigint_get_bigint (ecma_value_t value, bool *free_result_p);
ecma_value_t ecma_bigint_create_from_digits (const uint64_t *digits_p, uint32_t size, bool sign);
uint32_t ecma_bigint_get_size_in_digits (ecma_value_t value);
void ecma_bigint_get_digits_and_sign (ecma_value_t value, uint64_t *digits_p, uint32_t size, bool *sign_p);
jerry-core/ecma/operations/ecma-conversion.c
+26 -12
View File
@@ -247,6 +247,13 @@ ecma_op_to_boolean (ecma_value_t value) /**< ecma value */
return !ecma_string_is_empty (str_p);
}
#if ENABLED (JERRY_BUILTIN_BIGINT)
if (ecma_is_value_bigint (value))
{
return value != ECMA_BIGINT_ZERO;
}
#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */
JERRY_ASSERT (ecma_is_value_object (value) || ECMA_CHECK_SYMBOL_IN_ASSERT (value));
return true;
@@ -330,19 +337,22 @@ ecma_op_to_number (ecma_value_t value) /**< ecma value */
} /* ecma_op_to_number */
/**
* Helper to get the number contained in an ecma value.
* Helper to get the numeric value of an ecma value
*
* See also:
* ECMA-262 v5, 9.3
* ECMA-262 v11, 7.1.3
*
* @return ECMA_VALUE_EMPTY if successful
* conversion error otherwise
* @return ECMA_VALUE_EMPTY if converted to number, BigInt if
* converted to BigInt, and conversion error otherwise
* Returned value must be freed with ecma_free_value
*/
ecma_value_t
ecma_get_number (ecma_value_t value, /**< ecma value*/
ecma_number_t *number_p) /**< [out] ecma number */
ecma_op_to_numeric (ecma_value_t value, /**< ecma value */
ecma_number_t *number_p, /**< [out] ecma number */
ecma_to_numeric_options_t options) /**< option bits */
{
JERRY_UNUSED (options);
if (ecma_is_value_integer_number (value))
{
*number_p = ecma_get_integer_from_value (value);
@@ -396,27 +406,31 @@ ecma_get_number (ecma_value_t value, /**< ecma value*/
#if ENABLED (JERRY_BUILTIN_BIGINT)
if (ecma_is_value_bigint (value))
{
if (options & ECMA_TO_NUMERIC_ALLOW_BIGINT)
{
return ecma_copy_value (value);
}
return ecma_raise_type_error (ECMA_ERR_MSG ("Cannot convert a BigInt value to a number"));
}
#endif /* ENABLED (JERRY_BUILTIN_BIGINT) */
JERRY_ASSERT (ecma_is_value_object (value));
ecma_object_t *obj_p = ecma_get_object_from_value (value);
ecma_object_t *object_p = ecma_get_object_from_value (value);
ecma_value_t def_value = ecma_op_object_default_value (obj_p, ECMA_PREFERRED_TYPE_NUMBER);
ecma_value_t def_value = ecma_op_object_default_value (object_p, ECMA_PREFERRED_TYPE_NUMBER);
if (ECMA_IS_VALUE_ERROR (def_value))
{
return def_value;
}
ecma_value_t ret_value = ecma_get_number (def_value, number_p);
ecma_value_t ret_value = ecma_op_to_numeric (def_value, number_p, options);
ecma_fast_free_value (def_value);
return ret_value;
} /* ecma_get_number */
} /* ecma_op_to_numeric */
/**
* ToString operation.
@@ -935,7 +949,7 @@ ecma_op_to_integer (ecma_value_t value, /**< ecma value */
}
/* 1 */
ecma_value_t to_number = ecma_get_number (value, number_p);
ecma_value_t to_number = ecma_op_to_numeric (value, number_p, ECMA_TO_NUMERIC_NO_OPTS);
/* 2 */
if (ECMA_IS_VALUE_ERROR (to_number))
@@ -1015,7 +1029,7 @@ ecma_op_to_length (ecma_value_t value, /**< ecma value */
#else /* !ENABLED (JERRY_ESNEXT) */
/* In the case of ES5, ToLength(ES6) operation is the same as ToUint32(ES5) */
ecma_number_t num;
ecma_value_t to_number = ecma_get_number (value, &num);
ecma_value_t to_number = ecma_op_to_numeric (value, &num, ECMA_TO_NUMERIC_NO_OPTS);
/* 2 */
if (ECMA_IS_VALUE_ERROR (to_number))
jerry-core/ecma/operations/ecma-conversion.h
+10 -1
View File
@@ -37,6 +37,15 @@ typedef enum
ECMA_PREFERRED_TYPE_STRING /**< String */
} ecma_preferred_type_hint_t;
/**
* Option bits for ecma_op_to_numeric.
*/
typedef enum
{
ECMA_TO_NUMERIC_NO_OPTS = 0, /**< no options (same as toNumber operation) */
ECMA_TO_NUMERIC_ALLOW_BIGINT = (1 << 0), /**< allow BigInt values */
} ecma_to_numeric_options_t;
ecma_value_t ecma_op_check_object_coercible (ecma_value_t value);
bool ecma_op_same_value (ecma_value_t x, ecma_value_t y);
#if ENABLED (JERRY_BUILTIN_MAP)
@@ -45,7 +54,7 @@ bool ecma_op_same_value_zero (ecma_value_t x, ecma_value_t y);
ecma_value_t ecma_op_to_primitive (ecma_value_t value, ecma_preferred_type_hint_t preferred_type);
bool ecma_op_to_boolean (ecma_value_t value);
ecma_value_t ecma_op_to_number (ecma_value_t value);
ecma_value_t ecma_get_number (ecma_value_t value, ecma_number_t *number_p);
ecma_value_t ecma_op_to_numeric (ecma_value_t value, ecma_number_t *number_p, ecma_to_numeric_options_t options);
ecma_string_t *ecma_op_to_string (ecma_value_t value);
ecma_string_t *ecma_op_to_property_key (ecma_value_t value);
ecma_value_t ecma_op_to_object (ecma_value_t value);
jerry-core/ecma/operations/ecma-dataview-object.c
+1 -1
View File
@@ -71,7 +71,7 @@ ecma_op_dataview_create (const ecma_value_t *arguments_list_p, /**< arguments li
if (arguments_list_len > 1)
{
ecma_number_t number_offset, offset_num;
if (ECMA_IS_VALUE_ERROR (ecma_get_number (arguments_list_p[1], &number_offset)))
if (ECMA_IS_VALUE_ERROR (ecma_op_to_numeric (arguments_list_p[1], &number_offset, ECMA_TO_NUMERIC_NO_OPTS)))
{
return ECMA_VALUE_ERROR;
}
jerry-core/ecma/operations/ecma-objects.c
+1 -1
View File
@@ -1231,7 +1231,7 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */
if (array_index != ECMA_STRING_NOT_ARRAY_INDEX)
{
ecma_number_t num_var;
ecma_value_t error = ecma_get_number (value, &num_var);
ecma_value_t error = ecma_op_to_numeric (value, &num_var, ECMA_TO_NUMERIC_NO_OPTS);
if (ECMA_IS_VALUE_ERROR (error))
{
jerry-core/ecma/operations/ecma-regexp-object.c
+1 -1
View File
@@ -2207,7 +2207,7 @@ ecma_regexp_split_helper (ecma_value_t this_arg, /**< this value */
{
/* ECMA-262 v11, 21.2.5.13 13 */
ecma_number_t num;
if (ECMA_IS_VALUE_ERROR (ecma_get_number (limit_arg, &num)))
if (ECMA_IS_VALUE_ERROR (ecma_op_to_numeric (limit_arg, &num, ECMA_TO_NUMERIC_NO_OPTS)))
{
goto cleanup_splitter;
}
jerry-core/ecma/operations/ecma-try-catch-macro.h
+1 -1
View File
@@ -32,7 +32,7 @@
#define ECMA_OP_TO_NUMBER_TRY_CATCH(num_var, value, return_value) \
JERRY_ASSERT (return_value == ECMA_VALUE_EMPTY); \
ecma_number_t num_var; \
return_value = ecma_get_number (value, &num_var); \
return_value = ecma_op_to_numeric (value, &num_var, ECMA_TO_NUMERIC_NO_OPTS); \
\
if (JERRY_LIKELY (ecma_is_value_empty (return_value))) \
{
jerry-core/ecma/operations/ecma-typedarray-object.c
+2 -2
View File
@@ -720,7 +720,7 @@ ecma_op_typedarray_from_helper (ecma_value_t this_val, /**< this_arg for the abo
}
ecma_number_t num_var;
ecma_value_t mapped_number = ecma_get_number (mapped_value, &num_var);
ecma_value_t mapped_number = ecma_op_to_numeric (mapped_value, &num_var, ECMA_TO_NUMERIC_NO_OPTS);
ecma_free_value (mapped_value);
if (ECMA_IS_VALUE_ERROR (mapped_number))
@@ -1357,7 +1357,7 @@ ecma_op_typedarray_define_index_prop (ecma_object_t *obj_p, /**< a TypedArray ob
if (property_desc_p->flags & ECMA_PROP_IS_VALUE_DEFINED)
{
ecma_number_t num_var;
ecma_value_t error = ecma_get_number (property_desc_p->value, &num_var);
ecma_value_t error = ecma_op_to_numeric (property_desc_p->value, &num_var, ECMA_TO_NUMERIC_NO_OPTS);
if (ECMA_IS_VALUE_ERROR (error))
{