From 2e0332af6a6889e350c229dac5293b9e3d9b60a3 Mon Sep 17 00:00:00 2001
From: Ben Adams <thundercat@illyriad.co.uk>
Date: Tue, 9 Aug 2016 21:40:09 +0100
Subject: [PATCH] PR feedback

---
 src/vm/threadpoolrequest.h | 36 ++++++++++++++----------------------
 src/vm/win32threadpool.cpp |  6 ++----
 src/vm/win32threadpool.h   |  2 +-
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/src/vm/threadpoolrequest.h b/src/vm/threadpoolrequest.h
index af381c02fc0b..07bcbb7dbad0 100644
--- a/src/vm/threadpoolrequest.h
+++ b/src/vm/threadpoolrequest.h
@@ -174,17 +174,13 @@ class ManagedPerAppDomainTPCount : public IPerAppDomainTPCount {
     void DispatchWorkItem(bool* foundWork, bool* wasNotRecalled);
 
 private:
-    struct {
-        ADID m_id;
-        TPIndex m_index;
-    };
-    struct {
-        DECLSPEC_ALIGN(64) struct {
-            BYTE padding1[64 - sizeof(LONG)];
-            // Only use with VolatileLoad+VolatileStore+FastInterlockCompareExchange
-            LONG m_numRequestsPending;
-            BYTE padding2[64];
-        };
+    ADID m_id;
+    TPIndex m_index;
+    DECLSPEC_ALIGN(64) struct {
+        BYTE m_padding1[64 - sizeof(LONG)];
+        // Only use with VolatileLoad+VolatileStore+FastInterlockCompareExchange
+        LONG m_numRequestsPending;
+        BYTE m_padding2[64];
     };
 };
 
@@ -283,17 +279,13 @@ class UnManagedPerAppDomainTPCount : public IPerAppDomainTPCount {
     }
 
 private:
-    struct {
-        SpinLock m_lock;
-        ULONG m_NumRequests;
-    };
-    struct {
-        DECLSPEC_ALIGN(64) struct {
-            BYTE padding1[64 - sizeof(LONG)];
-            // Only use with VolatileLoad+VolatileStore+FastInterlockCompareExchange
-            LONG m_outstandingThreadRequestCount;
-            BYTE padding2[64];
-        };
+    SpinLock m_lock;
+    ULONG m_NumRequests;
+    DECLSPEC_ALIGN(64) struct {
+        BYTE m_padding1[64 - sizeof(LONG)];
+        // Only use with VolatileLoad+VolatileStore+FastInterlockCompareExchange
+        LONG m_outstandingThreadRequestCount;
+        BYTE m_padding2[64];
     };
 };
 
diff --git a/src/vm/win32threadpool.cpp b/src/vm/win32threadpool.cpp
index 7219bdaf61e7..cc58cead3157 100644
--- a/src/vm/win32threadpool.cpp
+++ b/src/vm/win32threadpool.cpp
@@ -4987,10 +4987,8 @@ DWORD __stdcall ThreadpoolMgr::TimerThreadStart(LPVOID p)
     if (pThread == NULL)
         return 0;
 
-    if (pTimerThread != pThread) {
-        pTimerThread = pThread;
-        // Timer threads never die
-    }
+    pTimerThread = pThread;
+    // Timer threads never die
 
     LastTickCount = GetTickCount();
 
diff --git a/src/vm/win32threadpool.h b/src/vm/win32threadpool.h
index a7ab5a714548..0ca01f8b650b 100644
--- a/src/vm/win32threadpool.h
+++ b/src/vm/win32threadpool.h
@@ -378,12 +378,12 @@ class ThreadpoolMgr
 
         Counts GetCleanCounts()
         {
+            LIMITED_METHOD_CONTRACT;
 #ifdef _WIN64
             // VolatileLoad x64 bit read is atomic
             return DangerousGetDirtyCounts();
 #else // !_WIN64
             // VolatileLoad may result in torn read
-            LIMITED_METHOD_CONTRACT;
             Counts result;
 #ifndef DACCESS_COMPILE
             result.AsLongLong = FastInterlockCompareExchangeLong(&counts.AsLongLong, 0, 0);