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

Fix the limit of the maximum number of directly stored properties in a hashmap (#3032)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik
2019-09-03 17:46:47 +02:00
committed by Dániel Bátyai
parent 952fb23e0e
commit 91e87fe34f
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/base/ecma-property-hashmap.c
+10 -5
View File
@@ -28,6 +28,11 @@
#if ENABLED (JERRY_PROPRETY_HASHMAP) #if ENABLED (JERRY_PROPRETY_HASHMAP)
/**
* Maximum number of properties that can be stored in a hashmap directly
*/
#define ECMA_PROPERTY_HASHMAP_SHIFT_LIMIT (UINT16_MAX + 1)
/** /**
* Compute the total size of the property hashmap. * Compute the total size of the property hashmap.
*/ */
@@ -141,7 +146,7 @@ ecma_property_hashmap_create (ecma_object_t *object_p) /**< object */
uint8_t shift_counter = 0; uint8_t shift_counter = 0;
while (max_property_count > LIT_STRING_HASH_LIMIT) while (max_property_count > ECMA_PROPERTY_HASHMAP_SHIFT_LIMIT)
{ {
shift_counter++; shift_counter++;
max_property_count >>= 1; max_property_count >>= 1;
@@ -170,7 +175,7 @@ ecma_property_hashmap_create (ecma_object_t *object_p) /**< object */
property_pair_p->names_cp[i]); property_pair_p->names_cp[i]);
uint32_t step = ecma_property_hashmap_steps[entry_index & (ECMA_PROPERTY_HASHMAP_NUMBER_OF_STEPS - 1)]; uint32_t step = ecma_property_hashmap_steps[entry_index & (ECMA_PROPERTY_HASHMAP_NUMBER_OF_STEPS - 1)];
if (mask < LIT_STRING_HASH_LIMIT) if (mask < ECMA_PROPERTY_HASHMAP_SHIFT_LIMIT)
{ {
entry_index &= mask; entry_index &= mask;
} }
@@ -264,7 +269,7 @@ ecma_property_hashmap_insert (ecma_object_t *object_p, /**< object */
uint32_t step = ecma_property_hashmap_steps[entry_index & (ECMA_PROPERTY_HASHMAP_NUMBER_OF_STEPS - 1)]; uint32_t step = ecma_property_hashmap_steps[entry_index & (ECMA_PROPERTY_HASHMAP_NUMBER_OF_STEPS - 1)];
uint32_t mask = hashmap_p->max_property_count - 1; uint32_t mask = hashmap_p->max_property_count - 1;
if (mask < LIT_STRING_HASH_LIMIT) if (mask < ECMA_PROPERTY_HASHMAP_SHIFT_LIMIT)
{ {
entry_index &= mask; entry_index &= mask;
} }
@@ -346,7 +351,7 @@ ecma_property_hashmap_delete (ecma_object_t *object_p, /**< object */
jmem_cpointer_t *pair_list_p = (jmem_cpointer_t *) (hashmap_p + 1); jmem_cpointer_t *pair_list_p = (jmem_cpointer_t *) (hashmap_p + 1);
uint8_t *bits_p = (uint8_t *) (pair_list_p + hashmap_p->max_property_count); uint8_t *bits_p = (uint8_t *) (pair_list_p + hashmap_p->max_property_count);
if (mask < LIT_STRING_HASH_LIMIT) if (mask < ECMA_PROPERTY_HASHMAP_SHIFT_LIMIT)
{ {
entry_index &= mask; entry_index &= mask;
} }
@@ -449,7 +454,7 @@ ecma_property_hashmap_find (ecma_property_hashmap_t *hashmap_p, /**< hashmap */
jmem_cpointer_t *pair_list_p = (jmem_cpointer_t *) (hashmap_p + 1); jmem_cpointer_t *pair_list_p = (jmem_cpointer_t *) (hashmap_p + 1);
uint8_t *bits_p = (uint8_t *) (pair_list_p + hashmap_p->max_property_count); uint8_t *bits_p = (uint8_t *) (pair_list_p + hashmap_p->max_property_count);
if (mask < LIT_STRING_HASH_LIMIT) if (mask < ECMA_PROPERTY_HASHMAP_SHIFT_LIMIT)
{ {
entry_index &= mask; entry_index &= mask;
} }
jerry-core/lit/lit-globals.h
-5
View File
@@ -123,9 +123,4 @@ typedef uint32_t lit_code_point_t;
*/ */
typedef uint32_t lit_string_hash_t; typedef uint32_t lit_string_hash_t;
/**
* Maximum value of ECMA string hash
*/
#define LIT_STRING_HASH_LIMIT UINT32_MAX
#endif /* !LIT_GLOBALS_H */ #endif /* !LIT_GLOBALS_H */