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

Restore deleted lines. (#1574)

Browse Source 
In a previous patch the original null count behaviour of the
property hashmap is just only partially restored. Now it is
restored fully Also another assertion was forgot to be fixed
in another patch, and we do so now.

JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
This commit is contained in:
Zoltan Herczeg 2017-02-10 10:53:43 +01:00 committed by GitHub
parent be720b2238
commit bfc5bee394
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jerry-core/ecma/base/ecma-property-hashmap.c
View File

@ -310,8 +310,13 @@ ecma_property_hashmap_insert (ecma_object_t *object_p, /**< object */
bits_p += (entry_index >> 3);
mask = (uint32_t) (1 << (entry_index & 0x7));
hashmap_p->null_count--;
JERRY_ASSERT (hashmap_p->null_count > 0);
if (!(*bits_p & mask))
{
/* Deleted entries also has ECMA_NULL_POINTER
* value, but they are not NULL values. */
hashmap_p->null_count--;
JERRY_ASSERT (hashmap_p->null_count > 0);
}
hashmap_p->unused_count--;
JERRY_ASSERT (hashmap_p->unused_count > 0);

2
jerry-core/parser/js/js-parser.c
View File

@ -323,7 +323,7 @@ parser_compute_indicies (parser_context_t *context_p, /**< context */
{
if (!(literal_p->status_flags & LEXER_FLAG_NO_REG_STORE))
{
JERRY_ASSERT (register_count < PARSER_MAXIMUM_NUMBER_OF_REGISTERS);
JERRY_ASSERT (register_count <= PARSER_MAXIMUM_NUMBER_OF_REGISTERS);
/* This var literal can be stored in a register. */
literal_p->prop.index = register_index;
register_index++;