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

Adjust fast array growth (#4868)

Browse Source 
Since we allow large buffer allocations during array constructor we could extend this behavior to [[Set]] operation as well.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik robert.fancsik@h-lab.eu
This commit is contained in:
Robert Fancsik
2021-12-15 10:35:28 +01:00
committed by GitHub
parent dbba83fe40
commit 7e0aa086ec
2 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/operations/ecma-array-object.c
+3 -23
View File
@@ -35,22 +35,6 @@
* @{ * @{
*/ */
#if JERRY_CPOINTER_32_BIT
/**
* Maximum length of the array length to allocate fast mode access for it
* e.g. new Array(5000) is constructed as fast mode access array,
* but new Array(50000000) is consturcted as normal property list based array
*/
#define ECMA_FAST_ARRAY_MAX_INITIAL_LENGTH (1 << 17)
#else /* JERRY_CPOINTER_32_BIT */
/**
* Maximum length of the array length to allocate fast mode access for it
* e.g. new Array(5000) is constructed as fast mode access array,
* but new Array(50000000) is consturcted as normal property list based array
*/
#define ECMA_FAST_ARRAY_MAX_INITIAL_LENGTH (1 << 13)
#endif /* JERRY_CPOINTER_32_BIT */
/** /**
* Property name type flag for array indices. * Property name type flag for array indices.
*/ */
@@ -130,7 +114,7 @@ ecma_op_new_array_object (uint32_t length) /**< length of the new array */
if (length > 0) if (length > 0)
{ {
if (length >= ECMA_FAST_ARRAY_MAX_INITIAL_LENGTH) if (length >= ECMA_FAST_ARRAY_MAX_HOLE_COUNT)
{ {
return object_p; return object_p;
} }
@@ -398,8 +382,7 @@ ecma_fast_array_set_property (ecma_object_t *object_p, /**< fast access mode arr
uint32_t old_holes = ext_obj_p->u.array.length_prop_and_hole_count; uint32_t old_holes = ext_obj_p->u.array.length_prop_and_hole_count;
uint32_t new_holes = index - old_length; uint32_t new_holes = index - old_length;
if (JERRY_UNLIKELY (new_holes > ECMA_FAST_ARRAY_MAX_NEW_HOLES_COUNT if (JERRY_UNLIKELY (new_holes > (ECMA_FAST_ARRAY_MAX_HOLE_COUNT - (old_holes >> ECMA_FAST_ARRAY_HOLE_SHIFT))))
|| ((old_holes >> ECMA_FAST_ARRAY_HOLE_SHIFT) + new_holes) > ECMA_FAST_ARRAY_MAX_HOLE_COUNT))
{ {
ecma_fast_array_convert_to_normal (object_p); ecma_fast_array_convert_to_normal (object_p);
@@ -623,8 +606,7 @@ ecma_fast_array_set_length (ecma_object_t *object_p, /**< fast access mode array
uint32_t old_holes = ext_obj_p->u.array.length_prop_and_hole_count; uint32_t old_holes = ext_obj_p->u.array.length_prop_and_hole_count;
uint32_t new_holes = new_length - old_length; uint32_t new_holes = new_length - old_length;
if (JERRY_UNLIKELY (new_holes > ECMA_FAST_ARRAY_MAX_NEW_HOLES_COUNT if (JERRY_UNLIKELY (new_holes > (ECMA_FAST_ARRAY_MAX_HOLE_COUNT - (old_holes >> ECMA_FAST_ARRAY_HOLE_SHIFT))))
|| ((old_holes >> ECMA_FAST_ARRAY_HOLE_SHIFT) + new_holes) > ECMA_FAST_ARRAY_MAX_HOLE_COUNT))
{ {
ecma_fast_array_convert_to_normal (object_p); ecma_fast_array_convert_to_normal (object_p);
} }
@@ -632,8 +614,6 @@ ecma_fast_array_set_length (ecma_object_t *object_p, /**< fast access mode array
{ {
ecma_fast_array_extend (object_p, new_length); ecma_fast_array_extend (object_p, new_length);
} }
return;
} /* ecma_fast_array_set_length */ } /* ecma_fast_array_set_length */
/** /**
jerry-core/ecma/operations/ecma-array-object.h
+1 -1
View File
@@ -60,7 +60,7 @@
/** /**
* Maximum number of array holes in a fast access mode array * Maximum number of array holes in a fast access mode array
*/ */
#define ECMA_FAST_ARRAY_MAX_HOLE_COUNT (1 << 24) #define ECMA_FAST_ARRAY_MAX_HOLE_COUNT (1 << 16)
ecma_object_t *ecma_op_new_array_object (uint32_t length); ecma_object_t *ecma_op_new_array_object (uint32_t length);