Prefer UINT32 over DWORD in the IBC BlockCount API's

7 files changed, 32 insertions, 32 deletions

diff --git a/src/ToolBox/superpmi/superpmi-shared/icorjitinfoimpl.h b/src/ToolBox/superpmi/superpmi-shared/icorjitinfoimpl.h
index 52526fa16f..61d70a2f37 100644
--- a/src/ToolBox/superpmi/superpmi-shared/icorjitinfoimpl.h
+++ b/src/ToolBox/superpmi/superpmi-shared/icorjitinfoimpl.h
@@ -1019,22 +1019,22 @@ void reportFatalError(CorJitResult result);
 /*
 struct BlockCounts  // Also defined here: code:CORBBTPROF_BLOCK_DATA
 {
-    ULONG ILOffset;
-    ULONG ExecutionCount;
+    UINT32 ILOffset;
+    UINT32 ExecutionCount;
 };
 */
 
 // allocate a basic block profile buffer where execution counts will be stored
 // for jitted basic blocks.
-HRESULT allocMethodBlockCounts(DWORD           count, // The number of basic blocks that we have
+HRESULT allocMethodBlockCounts(UINT32          count, // The number of basic blocks that we have
                                BlockCounts**   pBlockCounts);
 
 // get profile information to be used for optimizing the current method.  The format
 // of the buffer is the same as the format the JIT passes to allocMethodBlockCounts.
 HRESULT getMethodBlockCounts(CORINFO_METHOD_HANDLE ftnHnd,
-                             DWORD*            pCount, // The number of basic blocks that we have
+                             UINT32 *          pCount, // The number of basic blocks that we have
                              BlockCounts**     pBlockCounts,
-                             DWORD*            pNumRuns);
+                             UINT32 *          pNumRuns);
 
 // Associates a native call site, identified by its offset in the native code stream, with
 // the signature information and method handle the JIT used to lay out the call site. If
diff --git a/src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp b/src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp
index a832cae50d..96e95d1ed6 100644
--- a/src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp
+++ b/src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp
@@ -5238,9 +5238,9 @@ DWORD MethodContext::repGetFieldThreadLocalStoreID(CORINFO_FIELD_HANDLE field, v
 }
 
 void MethodContext::recGetMethodBlockCounts(CORINFO_METHOD_HANDLE        ftnHnd,
-                                            DWORD*                       pCount,
+                                            UINT32 *                     pCount,
                                             ICorJitInfo::BlockCounts**   pBlockCounts,
-                                            DWORD*                       pNumRuns,
+                                            UINT32 *                     pNumRuns,
                                             HRESULT                      result)
 {
     if (GetMethodBlockCounts == nullptr)
@@ -5269,17 +5269,17 @@ void MethodContext::dmpGetMethodBlockCounts(DWORDLONG key, const Agnostic_GetMet
     printf(" numRuns-%u result-%u", value.numRuns, value.result);
 }
 HRESULT MethodContext::repGetMethodBlockCounts(CORINFO_METHOD_HANDLE        ftnHnd,
-                                               DWORD*                       pCount,
+                                               UINT32 *                     pCount,
                                                ICorJitInfo::BlockCounts**   pBlockCounts,
-                                               DWORD*                       pNumRuns)
+                                               UINT32 *                     pNumRuns)
 {
     Agnostic_GetMethodBlockCounts tempValue;
 
     tempValue = GetMethodBlockCounts->Get((DWORDLONG)ftnHnd);
 
-    *pCount        = (ULONG)tempValue.count;
+    *pCount        = (UINT32)tempValue.count;
     *pBlockCounts  = (ICorJitInfo::BlockCounts*)GetMethodBlockCounts->GetBuffer(tempValue.pBlockCounts_index);
-    *pNumRuns      = (ULONG)tempValue.numRuns;
+    *pNumRuns      = (UINT32)tempValue.numRuns;
     HRESULT result = (HRESULT)tempValue.result;
     return result;
 }
diff --git a/src/ToolBox/superpmi/superpmi-shared/methodcontext.h b/src/ToolBox/superpmi/superpmi-shared/methodcontext.h
index d69ed715c8..c28a3f7233 100644
--- a/src/ToolBox/superpmi/superpmi-shared/methodcontext.h
+++ b/src/ToolBox/superpmi/superpmi-shared/methodcontext.h
@@ -1190,15 +1190,15 @@ public:
     DWORD repGetFieldThreadLocalStoreID(CORINFO_FIELD_HANDLE field, void** ppIndirection);
 
     void recGetMethodBlockCounts(CORINFO_METHOD_HANDLE        ftnHnd,
-                             DWORD*                       pCount,
-                             ICorJitInfo::BlockCounts**   pBlockCounts,
-                             DWORD*                       pNumRuns,
-                             HRESULT                      result);
+                                 UINT32 *                     pCount,
+                                 ICorJitInfo::BlockCounts**   pBlockCounts,
+                                 UINT32 *                     pNumRuns,
+                                 HRESULT                      result);
     void dmpGetMethodBlockCounts(DWORDLONG key, const Agnostic_GetMethodBlockCounts& value);
     HRESULT repGetMethodBlockCounts(CORINFO_METHOD_HANDLE        ftnHnd,
-                                DWORD*                       pCount,
-                                ICorJitInfo::BlockCounts**   pBlockCounts,
-                                DWORD*                       pNumRuns);
+                                    UINT32 *                     pCount,
+                                    ICorJitInfo::BlockCounts**   pBlockCounts,
+                                    UINT32 *                     pNumRuns);
 
     void recMergeClasses(CORINFO_CLASS_HANDLE cls1, CORINFO_CLASS_HANDLE cls2, CORINFO_CLASS_HANDLE result);
     void dmpMergeClasses(DLDL key, DWORDLONG value);
diff --git a/src/ToolBox/superpmi/superpmi-shim-collector/icorjitinfo.cpp b/src/ToolBox/superpmi/superpmi-shim-collector/icorjitinfo.cpp
index 794bb3a031..0d41b108bc 100644
--- a/src/ToolBox/superpmi/superpmi-shim-collector/icorjitinfo.cpp
+++ b/src/ToolBox/superpmi/superpmi-shim-collector/icorjitinfo.cpp
@@ -2117,7 +2117,7 @@ void interceptor_ICJI::reportFatalError(CorJitResult result)
 
 // allocate a basic block profile buffer where execution counts will be stored
 // for jitted basic blocks.
-HRESULT interceptor_ICJI::allocMethodBlockCounts(DWORD           count, // The number of basic blocks that we have
+HRESULT interceptor_ICJI::allocMethodBlockCounts(UINT32          count, // The number of basic blocks that we have
                                                  BlockCounts**   pBlockCounts)
 {
     mc->cr->AddCall("allocMethodBlockCounts");
@@ -2129,9 +2129,9 @@ HRESULT interceptor_ICJI::allocMethodBlockCounts(DWORD           count, // The n
 // get profile information to be used for optimizing the current method.  The format
 // of the buffer is the same as the format the JIT passes to allocMethodBlockCounts.
 HRESULT interceptor_ICJI::getMethodBlockCounts(CORINFO_METHOD_HANDLE ftnHnd,
-                                               DWORD*                pCount, // The number of basic blocks that we have
+                                               UINT32 *              pCount, // The number of basic blocks that we have
                                                BlockCounts**         pBlockCounts,
-                                               DWORD*                pNumRuns)
+                                               UINT32 *              pNumRuns)
 {
     mc->cr->AddCall("getMethodBlockCounts");
     HRESULT temp = original_ICorJitInfo->getMethodBlockCounts(ftnHnd, pCount, pBlockCounts, pNumRuns);
diff --git a/src/ToolBox/superpmi/superpmi-shim-counter/icorjitinfo.cpp b/src/ToolBox/superpmi/superpmi-shim-counter/icorjitinfo.cpp
index 94f4385170..587aeec641 100644
--- a/src/ToolBox/superpmi/superpmi-shim-counter/icorjitinfo.cpp
+++ b/src/ToolBox/superpmi/superpmi-shim-counter/icorjitinfo.cpp
@@ -1673,14 +1673,14 @@ void interceptor_ICJI::reportFatalError(CorJitResult result)
 /*
 struct BlockCounts  // Also defined here: code:CORBBTPROF_BLOCK_DATA
 {
-    ULONG ILOffset;
-    ULONG ExecutionCount;
+    UINT32 ILOffset;
+    UINT32 ExecutionCount;
 };
 */
 
 // allocate a basic block profile buffer where execution counts will be stored
 // for jitted basic blocks.
-HRESULT interceptor_ICJI::allocMethodBlockCounts(DWORD           count, // The number of basic blocks that we have
+HRESULT interceptor_ICJI::allocMethodBlockCounts(UINT32          count, // The number of basic blocks that we have
                                                  BlockCounts**   pBlockCounts)
 {
     mcs->AddCall("allocMethodBlockCounts");
@@ -1690,9 +1690,9 @@ HRESULT interceptor_ICJI::allocMethodBlockCounts(DWORD           count, // The n
 // get profile information to be used for optimizing the current method.  The format
 // of the buffer is the same as the format the JIT passes to allocMethodBlockCounts.
 HRESULT interceptor_ICJI::getMethodBlockCounts(CORINFO_METHOD_HANDLE ftnHnd,
-                                               DWORD*                pCount, // The number of basic blocks that we have
+                                               UINT32 *              pCount, // The number of basic blocks that we have
                                                BlockCounts**         pBlockCounts,
-                                               DWORD*                pNumRuns)
+                                               UINT32 *              pNumRuns)
 {
     mcs->AddCall("getMethodBlockCounts");
     return original_ICorJitInfo->getMethodBlockCounts(ftnHnd, pCount, pBlockCounts, pNumRuns);
diff --git a/src/ToolBox/superpmi/superpmi-shim-simple/icorjitinfo.cpp b/src/ToolBox/superpmi/superpmi-shim-simple/icorjitinfo.cpp
index 95cc39e722..e33d9e6e29 100644
--- a/src/ToolBox/superpmi/superpmi-shim-simple/icorjitinfo.cpp
+++ b/src/ToolBox/superpmi/superpmi-shim-simple/icorjitinfo.cpp
@@ -1497,7 +1497,7 @@ void interceptor_ICJI::reportFatalError(CorJitResult result)
 
 // allocate a basic block profile buffer where execution counts will be stored
 // for jitted basic blocks.
-HRESULT interceptor_ICJI::allocMethodBlockCounts(DWORD           count, // The number of basic blocks that we have
+HRESULT interceptor_ICJI::allocMethodBlockCounts(UINT32          count, // The number of basic blocks that we have
                                                  BlockCounts**   pBlockCounts)
 {
     return original_ICorJitInfo->allocMethodBlockCounts(count, pBlockCounts);
@@ -1506,9 +1506,9 @@ HRESULT interceptor_ICJI::allocMethodBlockCounts(DWORD           count, // The n
 // get profile information to be used for optimizing the current method.  The format
 // of the buffer is the same as the format the JIT passes to allocMethodBlockCounts.
 HRESULT interceptor_ICJI::getMethodBlockCounts(CORINFO_METHOD_HANDLE ftnHnd,
-                                               DWORD*                pCount, // The number of basic blocks that we have
+                                               UINT32 *              pCount, // The number of basic blocks that we have
                                                BlockCounts**         pBlockCounts,
-                                               DWORD*                pNumRuns)
+                                               UINT32 *              pNumRuns)
 {
     return original_ICorJitInfo->getMethodBlockCounts(ftnHnd, pCount, pBlockCounts, pNumRuns);
 }
diff --git a/src/ToolBox/superpmi/superpmi/icorjitinfo.cpp b/src/ToolBox/superpmi/superpmi/icorjitinfo.cpp
index 168c51a76b..2ced2d812c 100644
--- a/src/ToolBox/superpmi/superpmi/icorjitinfo.cpp
+++ b/src/ToolBox/superpmi/superpmi/icorjitinfo.cpp
@@ -1810,7 +1810,7 @@ void MyICJI::reportFatalError(CorJitResult result)
 
 // allocate a basic block profile buffer where execution counts will be stored
 // for jitted basic blocks.
-HRESULT MyICJI::allocMethodBlockCounts(DWORD           count, // The number of basic blocks that we have
+HRESULT MyICJI::allocMethodBlockCounts(UINT32          count, // The number of basic blocks that we have
                                        BlockCounts**   pBlockCounts)
 {
     jitInstance->mc->cr->AddCall("allocMethodBlockCounts");
@@ -1820,9 +1820,9 @@ HRESULT MyICJI::allocMethodBlockCounts(DWORD           count, // The number of b
 // get profile information to be used for optimizing the current method.  The format
 // of the buffer is the same as the format the JIT passes to allocMethodBlockCounts.
 HRESULT MyICJI::getMethodBlockCounts(CORINFO_METHOD_HANDLE ftnHnd,
-                                     DWORD*                pCount, // The number of basic blocks that we have
+                                     UINT32 *              pCount, // The number of basic blocks that we have
                                      BlockCounts**         pBlockCounts,
-                                     DWORD*                pNumRuns)
+                                     UINT32 *              pNumRuns)
 {
     jitInstance->mc->cr->AddCall("getMethodBlockCounts");
     return jitInstance->mc->repGetMethodBlockCounts(ftnHnd, pCount, pBlockCounts, pNumRuns);