[sgen] Factor out the finalize hash tables into a reusable hash table implementation.

[mono.git] / mono / metadata / sgen-internal.c

diff --git a/mono/metadata/sgen-internal.c b/mono/metadata/sgen-internal.c
index a337bfbfe3fc3554575956684557abd31a98684d..0000a8a6a7f0e55a41775e2119cf8f8f09da8b69 100644 (file)
--- a/mono/metadata/sgen-internal.c
+++ b/mono/metadata/sgen-internal.c
@@ -70,12 +70,14 @@ mono_sgen_register_fixed_internal_mem_type (int type, size_t size)
        int slot;
 
        g_assert (type >= 0 && type < INTERNAL_MEM_MAX);
-       g_assert (fixed_type_allocator_indexes [type] == -1);
 
        slot = index_for_size (size);
        g_assert (slot >= 0);
 
-       fixed_type_allocator_indexes [type] = slot;
+       if (fixed_type_allocator_indexes [type] == -1)
+               fixed_type_allocator_indexes [type] = slot;
+       else
+               g_assert (fixed_type_allocator_indexes [type] == slot);
 }
 
 void*
@@ -140,7 +142,7 @@ mono_sgen_dump_internal_mem_usage (FILE *heap_dump_file)
 {
        /*
        static char const *internal_mem_names [] = { "pin-queue", "fragment", "section", "scan-starts",
-                                                    "fin-table", "finalize-entry", "dislink-table",
+                                                    "fin-table", "finalize-entry", "finalize-ready-entry", "dislink-table",
                                                     "dislink", "roots-table", "root-record", "statistics",
                                                     "remset", "gray-queue", "store-remset", "marksweep-tables",
                                                     "marksweep-block-info", "ephemeron-link", "worker-data",