ets: use ets_hashtable_free_node directly

Signed-off-by: Jakub Gonet <jakub.gonet@swmansion.com>

Author: jgonet

src/libAtomVM/ets.c

@@ -293,7 +293,9 @@ static EtsErrorCode ets_table_insert_list(struct EtsTable *ets_table, term list,
         term tuple = term_get_list_head(list);
         nodes[i] = ets_hashtable_new_node(tuple, ets_table->keypos);
         if (IS_NULL_PTR(nodes[i])) {
-            ets_hashtable_free_node_array(nodes, i, ctx->global);
+            for (size_t it = 0; it < i; ++it) {
+                ets_hashtable_free_node(nodes[it], ctx->global);
+            }
             free(nodes);
             return EtsAllocationFailure;
         }

src/libAtomVM/ets_hashtable.c

@@ -53,19 +53,12 @@ struct EtsHashTable *ets_hashtable_new()
     return htable;
 }
 
-static void ets_hashtable_free_node(struct HNode *node, GlobalContext *global)
+void ets_hashtable_free_node(struct HNode *node, GlobalContext *global)
 {
     memory_destroy_heap(&node->heap, global);
     free(node);
 }
 
-void ets_hashtable_free_node_array(struct HNode **allocated, size_t size, GlobalContext *global)
-{
-    for (size_t i = 0; i < size; ++i) {
-        ets_hashtable_free_node(allocated[i], global);
-    }
-}
-
 void ets_hashtable_destroy(struct EtsHashTable *hash_table, GlobalContext *global)
 {
     for (size_t i = 0; i < hash_table->capacity; ++i) {
@@ -96,26 +89,30 @@ static void print_info(struct EtsHashTable *hash_table)
 
 struct HNode *ets_hashtable_new_node(term entry, int keypos)
 {
-
     struct HNode *new_node = malloc(sizeof(struct HNode));
     if (IS_NULL_PTR(new_node)) {
-        return NULL;
+        goto cleanup;
     }
 
-    size_t size = (size_t) memory_estimate_usage(entry);
-    if (memory_init_heap(&new_node->heap, size) != MEMORY_GC_OK) {
-        free(new_node);
-        return NULL;
+    size_t size = memory_estimate_usage(entry);
+    if (UNLIKELY(memory_init_heap(&new_node->heap, size) != MEMORY_GC_OK)) {
+        goto cleanup;
     }
 
     term new_entry = memory_copy_term_tree(&new_node->heap, entry);
+    TERM_DEBUG_ASSERT(term_is_tuple(new_entry));
+    TERM_DEBUG_ASSERT(term_get_tuple_arity(new_entry) >= keypos);
     term key = term_get_tuple_element(new_entry, keypos);
 
     new_node->next = NULL;
     new_node->key = key;
     new_node->entry = new_entry;
 
     return new_node;
+
+cleanup:
+    free(new_node);
+    return NULL;
 }
 
 EtsHashtableErrorCode ets_hashtable_insert(struct EtsHashTable *hash_table, struct HNode *new_node, EtsHashtableOptions opts, GlobalContext *global)
@@ -145,7 +142,6 @@ EtsHashtableErrorCode ets_hashtable_insert(struct EtsHashTable *hash_table, stru
                 ets_hashtable_free_node(node, global);
                 return EtsHashtableOk;
             } else {
-                ets_hashtable_free_node(new_node, global);
                 return EtsHashtableFailure;
             }
         }
@@ -193,11 +189,8 @@ bool ets_hashtable_remove(struct EtsHashTable *hash_table, term key, size_t keyp
     while (node) {
         term key_to_compare = term_get_tuple_element(node->entry, keypos);
         if (term_compare(key, key_to_compare, TermCompareExact, global) == TermEquals) {
-
-            memory_destroy_heap(&node->heap, global);
             struct HNode *next_node = node->next;
-            free(node);
-
+            ets_hashtable_free_node(node, global);
             if (prev_node != NULL) {
                 prev_node->next = next_node;
             } else {

src/libAtomVM/ets_hashtable.h

@@ -56,7 +56,7 @@ EtsHashtableErrorCode ets_hashtable_insert(struct EtsHashTable *hash_table, stru
 term ets_hashtable_lookup(struct EtsHashTable *hash_table, term key, size_t keypos, GlobalContext *global);
 bool ets_hashtable_remove(struct EtsHashTable *hash_table, term key, size_t keypos, GlobalContext *global);
 struct HNode *ets_hashtable_new_node(term entry, int keypos);
-void ets_hashtable_free_node_array(struct HNode **allocated, size_t len, GlobalContext *global);
+void ets_hashtable_free_node(struct HNode *node, GlobalContext *global);
 
 #ifdef __cplusplus
 }