Remove empty Threadpool .cctors

dotnet · Feb 12, 2016 · b2026f3 · b2026f3
1 parent cb1effa
commit b2026f3
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/src/mscorlib/src/System/Threading/ThreadPool.cs b/src/mscorlib/src/System/Threading/ThreadPool.cs
@@ -56,11 +56,12 @@ internal static class ThreadPoolGlobals
         public static bool enableWorkerTracking;
 
         [SecurityCritical]
-        public static ThreadPoolWorkQueue workQueue = new ThreadPoolWorkQueue();
+        public static ThreadPoolWorkQueue workQueue = InitWorkQueue();
 
-        [System.Security.SecuritySafeCritical] // static constructors should be safe to call
-        static ThreadPoolGlobals()
+        [SecurityCritical]
+        private static ThreadPoolWorkQueue InitWorkQueue()
         {
+            return new ThreadPoolWorkQueue();
         }
     }
 
@@ -1168,9 +1169,6 @@ internal interface IThreadPoolWorkItem
 
     internal sealed class QueueUserWorkItemCallback : IThreadPoolWorkItem
     {
-        [System.Security.SecuritySafeCritical]
-        static QueueUserWorkItemCallback() {}
-
         private WaitCallback callback;
         private ExecutionContext context;
         private Object state;
@@ -1249,7 +1247,13 @@ void IThreadPoolWorkItem.MarkAborted(ThreadAbortException tae)
         }
 
         [System.Security.SecurityCritical]
-        static internal ContextCallback ccb = new ContextCallback(WaitCallback_Context);
+        static internal ContextCallback ccb = InitCallbackContext();
+
+        [System.Security.SecurityCritical]
+        static private ContextCallback InitCallbackContext()
+        {
+            return new ContextCallback(WaitCallback_Context);
+        }
 
         [System.Security.SecurityCritical]
         static private void WaitCallback_Context(Object state)
@@ -1263,16 +1267,19 @@ static private void WaitCallback_Context(Object state)
 
     internal class _ThreadPoolWaitOrTimerCallback
     {
-        [System.Security.SecuritySafeCritical]
-        static _ThreadPoolWaitOrTimerCallback() {}
-
         WaitOrTimerCallback _waitOrTimerCallback;
         ExecutionContext _executionContext;
         Object _state;
         [System.Security.SecurityCritical]
         static private ContextCallback _ccbt = new ContextCallback(WaitOrTimerCallback_Context_t);
         [System.Security.SecurityCritical]
-        static private ContextCallback _ccbf = new ContextCallback(WaitOrTimerCallback_Context_f);
+        static private ContextCallback _ccbf = InitCallbackContext();
+
+        [System.Security.SecurityCritical]
+        static private ContextCallback InitCallbackContext()
+        {
+            return new ContextCallback(WaitOrTimerCallback_Context_f);
+        }
 
         [System.Security.SecurityCritical]  // auto-generated
         internal _ThreadPoolWaitOrTimerCallback(WaitOrTimerCallback waitOrTimerCallback, Object state, bool compressStack, ref StackCrawlMark stackMark)