Restore deleted lines. (#1574)

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 [email protected]
This commit is contained in:
Zoltan Herczeg authored and GitHub committed 2017-02-10 10:53:43 +01:00
1 parent be720b2238
commit bfc5bee394
2 files changed
+8 -3

No files matched your search

+7 -2
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);
+1 -1
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++;