From d8412707479bb1934dc484f35cb192de9c0a2fbd Mon Sep 17 00:00:00 2001 From: Zoltan Herczeg Date: Thu, 22 Feb 2018 01:13:49 +0100 Subject: [PATCH] Exclude hashmaps from GC marks. (#2212) Fixes #2146. JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com --- jerry-core/ecma/base/ecma-gc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/jerry-core/ecma/base/ecma-gc.c b/jerry-core/ecma/base/ecma-gc.c index f8f75ef1a..6f328bd25 100644 --- a/jerry-core/ecma/base/ecma-gc.c +++ b/jerry-core/ecma/base/ecma-gc.c @@ -381,10 +381,15 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */ { ecma_property_header_t *prop_iter_p = ecma_get_property_list (object_p); + if (prop_iter_p != NULL && prop_iter_p->types[0] == ECMA_PROPERTY_TYPE_HASHMAP) + { + prop_iter_p = ECMA_GET_POINTER (ecma_property_header_t, + prop_iter_p->next_property_cp); + } + while (prop_iter_p != NULL) { - JERRY_ASSERT (prop_iter_p->types[0] == ECMA_PROPERTY_TYPE_HASHMAP - || ECMA_PROPERTY_IS_PROPERTY_PAIR (prop_iter_p)); + JERRY_ASSERT (ECMA_PROPERTY_IS_PROPERTY_PAIR (prop_iter_p)); ecma_gc_mark_property ((ecma_property_pair_t *) prop_iter_p, 0); ecma_gc_mark_property ((ecma_property_pair_t *) prop_iter_p, 1);