[sgen] Finish concurrent collection before clearing a domain.

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

diff --git a/mono/metadata/sgen-gc.c b/mono/metadata/sgen-gc.c
index 9907ecb50e5aba4e2d4e0d63d61b2053ba858cef..f5a4c25f3db2dc71b974f7ffc989dd20cc31156f 100644 (file)
--- a/mono/metadata/sgen-gc.c
+++ b/mono/metadata/sgen-gc.c
@@ -553,6 +553,8 @@ static int mark_ephemerons_in_range (ScanCopyContext ctx);
 static void clear_unreachable_ephemerons (gboolean concurrent_cementing, ScanCopyContext ctx);
 static void null_ephemerons_for_domain (MonoDomain *domain);
 
+static gboolean major_update_or_finish_concurrent_collection (gboolean force_finish);
+
 SgenObjectOperations current_object_ops;
 SgenMajorCollector major_collector;
 SgenMinorCollector sgen_minor_collector;
@@ -1070,6 +1072,10 @@ mono_gc_clear_domain (MonoDomain * domain)
 
        LOCK_GC;
 
+       if (concurrent_collection_in_progress)
+               sgen_perform_collection (0, GENERATION_OLD, "clear domain", TRUE);
+       g_assert (!concurrent_collection_in_progress);
+
        sgen_process_fin_stage_entries ();
        sgen_process_dislink_stage_entries ();