The thread triggering finalizer shutdown events should be in an alert…

…able state. (dotnet#24133)
EgorBo · Apr 20, 2019 · 324344f · 324344f
1 parent 0f93182
commit 324344f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/vm/finalizerthread.h b/src/vm/finalizerthread.h
@@ -68,7 +68,11 @@ class FinalizerThread
 
         // Do not wait for FinalizerThread if the current one is FinalizerThread.
         if (GetThread() != GetFinalizerThread())
-            hEventFinalizerToShutDown->Wait(INFINITE,FALSE);
+        {
+            // This wait must be alertable to handle cases where the current
+            // thread's context is needed (i.e. RCW cleanup)
+            hEventFinalizerToShutDown->Wait(INFINITE, /*alertable*/ TRUE);
+        }
     }
 
     static void FinalizerThreadWait(DWORD timeout = INFINITE);