Don't wake up other GC threads when we decide to not proceed with the GC (#14719)

1 files changed, 17 insertions, 2 deletions

diff --git a/src/gc/gc.cpp b/src/gc/gc.cpp
index 7df1911668..042f2f4929 100644
--- a/src/gc/gc.cpp
+++ b/src/gc/gc.cpp
@@ -5401,9 +5401,11 @@ void gc_heap::gc_thread_function ()
                 proceed_with_gc_p = FALSE;
             }
             else
+            {
                 settings.init_mechanisms();
+                gc_start_event.Set();
+            }
             dprintf (3, ("%d gc thread waiting...", heap_number));
-            gc_start_event.Set();
         }
         else
         {
@@ -5411,6 +5413,8 @@ void gc_heap::gc_thread_function ()
             dprintf (3, ("%d gc thread waiting... Done", heap_number));
         }
 
+        assert ((heap_number == 0) || proceed_with_gc_p);
+
         if (proceed_with_gc_p)
             garbage_collect (GCHeap::GcCondemnedGeneration);
 
@@ -5447,7 +5451,18 @@ void gc_heap::gc_thread_function ()
 
             gc_heap::internal_gc_done = true;
 
-            set_gc_done();
+            if (proceed_with_gc_p)
+                set_gc_done();
+            else
+            {
+                // If we didn't actually do a GC, it means we didn't wait up the other threads,
+                // we still need to set the gc_done_event for those threads.
+                for (int i = 0; i < gc_heap::n_heaps; i++)
+                {
+                    gc_heap* hp = gc_heap::g_heaps[i];
+                    hp->set_gc_done();
+                }
+            }
         }
         else
         {