archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Fixing: deallocation of number-represented ecma-string; [[Get]] of Arguments object for index arguments.

Browse Source
This commit is contained in:
Ruben Ayrapetyan 2014-08-20 13:47:51 +04:00
parent f9ff4e1ba3
commit fe34bf7e01
2 changed files with 61 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libecmaobjects/ecma-helpers-string.c
View File

@ -189,6 +189,12 @@ ecma_deref_ecma_string (ecma_string_t *string_p) /**< ecma-string */
chunk_p = next_chunk_p;
}
}
else if (string_p->container == ECMA_STRING_CONTAINER_HEAP_NUMBER)
{
ecma_number_t *num_p = ECMA_GET_POINTER (string_p->u.number_cp);
ecma_dealloc_number (num_p);
}
else
{
JERRY_ASSERT (string_p->container == ECMA_STRING_CONTAINER_IN_DESCRIPTOR
@ -364,7 +370,19 @@ ecma_compare_ecma_string_to_ecma_string (const ecma_string_t *string1_p, /* ecma
if (string1_p->container == ECMA_STRING_CONTAINER_HEAP_NUMBER
|| string2_p->container == ECMA_STRING_CONTAINER_HEAP_NUMBER)
{
JERRY_UNIMPLEMENTED ();
if (string1_p->container == ECMA_STRING_CONTAINER_HEAP_NUMBER
&& string2_p->container == ECMA_STRING_CONTAINER_HEAP_NUMBER)
{
ecma_number_t *num1_p, *num2_p;
num1_p = ECMA_GET_POINTER (string1_p->u.number_cp);
num2_p = ECMA_GET_POINTER (string2_p->u.number_cp);
return (*num1_p == *num2_p);
}
else
{
JERRY_UNIMPLEMENTED ();
}
}
JERRY_ASSERT (string1_p->is_length_valid);

53
src/libecmaoperations/ecma-objects-arguments.c
View File

@ -84,6 +84,8 @@ ecma_create_arguments_object (ecma_object_t *func_obj_p, /**< callee function */
false);
JERRY_ASSERT (ecma_is_completion_value_normal_true (completion));
ecma_dealloc_number (len_p);
// 11.a, 11.b
for (ecma_length_t indx = 0;
indx < arguments_list_length;
@ -162,9 +164,15 @@ ecma_create_arguments_object (ecma_object_t *func_obj_p, /**< callee function */
{
ecma_string_t *indx_string_p = ecma_new_ecma_string_from_number (ecma_uint32_to_number ((uint32_t) indx));
prop_desc = ecma_make_empty_property_descriptor ();
{
prop_desc.is_value_defined = true;
prop_desc.value = ecma_make_string_value (name_p);
}
completion = ecma_op_object_define_own_property (map_p,
indx_string_p,
ecma_make_empty_property_descriptor (),
prop_desc,
false);
JERRY_ASSERT (ecma_is_completion_value_normal_true (completion));
@ -182,6 +190,8 @@ ecma_create_arguments_object (ecma_object_t *func_obj_p, /**< callee function */
ecma_property_t *scope_prop_p = ecma_create_internal_property (map_p,
ECMA_INTERNAL_PROPERTY_SCOPE);
ECMA_SET_POINTER(scope_prop_p->u.internal_property.value, lex_env_p);
ecma_deref_object (map_p);
}
// 13.
@ -249,6 +259,35 @@ ecma_create_arguments_object (ecma_object_t *func_obj_p, /**< callee function */
return obj_p;
} /* ecma_create_arguments_object */
/**
* Get value of function's argument mapped to index of Arguments object.
*
* @return completion value
* Returned value must be freed with ecma_free_completion_value
*/
static ecma_completion_value_t
ecma_arguments_get_mapped_arg_value (ecma_object_t *map_p, /**< [[ParametersMap]] object */
ecma_property_t *arg_name_prop_p) /**< property of [[ParametersMap]]
corresponding to index and value
equal to mapped argument's name */
{
ecma_property_t *scope_prop_p = ecma_get_internal_property (map_p, ECMA_INTERNAL_PROPERTY_SCOPE);
ecma_object_t *lex_env_p = ECMA_GET_POINTER (scope_prop_p->u.internal_property.value);
JERRY_ASSERT(lex_env_p != NULL && lex_env_p->is_lexical_environment);
ecma_value_t arg_name_prop_value = arg_name_prop_p->u.named_data_property.value;
JERRY_ASSERT (arg_name_prop_value.value_type == ECMA_TYPE_STRING);
ecma_string_t *arg_name_p = ECMA_GET_POINTER (arg_name_prop_value.value);
ecma_completion_value_t completion = ecma_op_get_binding_value (lex_env_p,
arg_name_p,
true);
JERRY_ASSERT (ecma_is_completion_value_normal (completion));
return completion;
} /* ecma_arguments_get_mapped_arg_value */
/**
* [[Get]] ecma Arguments object's operation
*
@ -281,7 +320,7 @@ ecma_op_arguments_object_get (ecma_object_t *obj_p, /**< the object */
else
{
// 4.
JERRY_UNIMPLEMENTED ();
return ecma_arguments_get_mapped_arg_value (map_p, mapped_prop_p);
}
} /* ecma_op_arguments_object_get */
@ -319,15 +358,7 @@ ecma_op_arguments_object_get_own_property (ecma_object_t *obj_p, /**< the object
if (mapped_prop_p != NULL)
{
// a.
ecma_property_t *scope_prop_p = ecma_get_internal_property (map_p, ECMA_INTERNAL_PROPERTY_SCOPE);
ecma_object_t *lex_env_p = ECMA_GET_POINTER(scope_prop_p->u.internal_property.value);
JERRY_ASSERT(lex_env_p != NULL && lex_env_p->is_lexical_environment);
ecma_completion_value_t completion = ecma_op_get_binding_value (lex_env_p,
property_name_p,
true);
JERRY_ASSERT (ecma_is_completion_value_normal (completion));
ecma_completion_value_t completion = ecma_arguments_get_mapped_arg_value (map_p, mapped_prop_p);
ecma_free_value (desc_p->u.named_data_property.value, false);
desc_p->u.named_data_property.value = ecma_copy_value (completion.value, false);