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

Fix incorrect interchange of interfaces taking to ecma values and ecma completion values.

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan r.ayrapetyan@samsung.com
This commit is contained in:
Ruben Ayrapetyan
2015-06-19 19:28:00 +03:00
parent bac7908448
commit 81d13b0676
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.cpp
+5 -5
View File
@@ -489,7 +489,7 @@ ecma_builtin_array_prototype_object_to_locale_string (const ecma_value_t this_ar
ecma_op_to_object (this_arg), ecma_op_to_object (this_arg),
ret_value); ret_value);
ecma_object_t *obj_p = ecma_get_object_from_completion_value (obj_value); ecma_object_t *obj_p = ecma_get_object_from_value (obj_value);
ecma_string_t *length_magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LENGTH); ecma_string_t *length_magic_string_p = ecma_get_magic_string (ECMA_MAGIC_STRING_LENGTH);
@@ -532,7 +532,7 @@ ecma_builtin_array_prototype_object_to_locale_string (const ecma_value_t this_ar
ecma_builtin_helper_get_to_locale_string_at_index (obj_p, k), ecma_builtin_helper_get_to_locale_string_at_index (obj_p, k),
ret_value); ret_value);
ecma_string_t *next_string_p = ecma_get_string_from_completion_value (next_string_value); ecma_string_t *next_string_p = ecma_get_string_from_value (next_string_value);
ecma_deref_ecma_string (return_string_p); ecma_deref_ecma_string (return_string_p);
@@ -1736,7 +1736,7 @@ ecma_builtin_array_prototype_object_every (ecma_value_t this_arg, /**< this argu
ECMA_TRY_CATCH (call_value, ecma_op_function_call (func_object_p, arg2, call_args, 3), ret_value); ECMA_TRY_CATCH (call_value, ecma_op_function_call (func_object_p, arg2, call_args, 3), ret_value);
/* 7.c.iii, ecma_op_to_boolean always returns a simple value, so no need to free. */ /* 7.c.iii, ecma_op_to_boolean always returns a simple value, so no need to free. */
if (!ecma_is_value_true (ecma_op_to_boolean (call_value))) if (ecma_is_completion_value_normal_false (ecma_op_to_boolean (call_value)))
{ {
ret_value = ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_FALSE); ret_value = ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_FALSE);
} }
@@ -1837,7 +1837,7 @@ ecma_builtin_array_prototype_object_some (ecma_value_t this_arg, /**< this argum
ECMA_TRY_CATCH (call_value, ecma_op_function_call (func_object_p, arg2, call_args, 3), ret_value); ECMA_TRY_CATCH (call_value, ecma_op_function_call (func_object_p, arg2, call_args, 3), ret_value);
/* 7.c.iii, ecma_op_to_boolean always returns a simple value, so no need to free. */ /* 7.c.iii, ecma_op_to_boolean always returns a simple value, so no need to free. */
if (ecma_is_value_true (ecma_op_to_boolean (call_value))) if (ecma_is_completion_value_normal_true (ecma_op_to_boolean (call_value)))
{ {
ret_value = ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_TRUE); ret_value = ecma_make_simple_completion_value (ECMA_SIMPLE_VALUE_TRUE);
} }
@@ -1944,7 +1944,7 @@ ecma_builtin_array_prototype_object_filter (ecma_value_t this_arg, /**< this arg
ECMA_TRY_CATCH (call_value, ecma_op_function_call (func_object_p, arg2, call_args, 3), ret_value); ECMA_TRY_CATCH (call_value, ecma_op_function_call (func_object_p, arg2, call_args, 3), ret_value);
/* 9.c.iii, ecma_op_to_boolean always returns a simple value, so no need to free. */ /* 9.c.iii, ecma_op_to_boolean always returns a simple value, so no need to free. */
if (ecma_is_value_true (ecma_op_to_boolean (call_value))) if (ecma_is_completion_value_normal_true (ecma_op_to_boolean (call_value)))
{ {
ecma_string_t* to_index_string_p = ecma_new_ecma_string_from_uint32 (new_array_index); ecma_string_t* to_index_string_p = ecma_new_ecma_string_from_uint32 (new_array_index);
/* /*
jerry-core/ecma/builtin-objects/ecma-builtin-object.cpp
+2 -2
View File
@@ -670,7 +670,7 @@ ecma_builtin_object_object_define_properties (ecma_value_t this_arg __attr_unuse
ecma_op_to_object (arg2), ecma_op_to_object (arg2),
ret_value); ret_value);
ecma_object_t *props_p = ecma_get_object_from_completion_value (props); ecma_object_t *props_p = ecma_get_object_from_value (props);
ecma_property_t *property_p; ecma_property_t *property_p;
// First we need to know how many properties should be stored // First we need to know how many properties should be stored
@@ -732,7 +732,7 @@ ecma_builtin_object_object_define_properties (ecma_value_t this_arg __attr_unuse
// 5.b // 5.b
ECMA_TRY_CATCH (conv_result, ECMA_TRY_CATCH (conv_result,
ecma_op_to_property_descriptor (ecma_get_completion_value_value (desc_obj), ecma_op_to_property_descriptor (desc_obj,
&property_descriptors[index]), &property_descriptors[index]),
ret_value); ret_value);
jerry-core/vm/opcodes-native-call.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ opfunc_native_call (opcode_t opdata, /**< operation data */
JERRY_STATIC_ASSERT (OPCODE_NATIVE_CALL__COUNT < (1u << (sizeof (native_call_id_idx) * JERRY_BITSINBYTE))); JERRY_STATIC_ASSERT (OPCODE_NATIVE_CALL__COUNT < (1u << (sizeof (native_call_id_idx) * JERRY_BITSINBYTE)));
ecma_completion_value_t ret_value = 0; ecma_completion_value_t ret_value = ecma_make_empty_completion_value ();
MEM_DEFINE_LOCAL_ARRAY (arg_values, args_number, ecma_value_t); MEM_DEFINE_LOCAL_ARRAY (arg_values, args_number, ecma_value_t);