Add null check for WaitInfo (#49628)

* Add null check for WaitInfo

* Remove OnThreadExiting static from WaitSubsystem

diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/WaitSubsystem.Unix.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/WaitSubsystem.Unix.cs
index bd622d9..e259f38 100644 (file)
--- a/src/libraries/System.Private.CoreLib/src/System/Threading/WaitSubsystem.Unix.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Threading/WaitSubsystem.Unix.cs
@@ -424,10 +424,5 @@ namespace System.Threading
                 s_lock.Release();
             }
         }
-
-        public static void OnThreadExiting(Thread thread)
-        {
-            thread.WaitInfo.OnThreadExiting();
-        }
     }
 }

diff --git a/src/mono/System.Private.CoreLib/src/System/Threading/Thread.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Threading/Thread.Mono.cs
index c1978ea..2c7c040 100644 (file)
--- a/src/mono/System.Private.CoreLib/src/System/Threading/Thread.Mono.cs
+++ b/src/mono/System.Private.CoreLib/src/System/Threading/Thread.Mono.cs
@@ -82,7 +82,7 @@ namespace System.Threading
         ~Thread()
         {
 #if TARGET_UNIX || TARGET_BROWSER
-            WaitSubsystem.OnThreadExiting(this);
+            _waitInfo?.OnThreadExiting();
 #endif
             FreeInternal();
         }