Merge pull request #24242 from janvorli/fix-numa-node-for-disabled-numa

Fix NUMA node for heap when NUMA is not available

1 files changed, 13 insertions, 13 deletions

diff --git a/src/gc/windows/gcenv.windows.cpp b/src/gc/windows/gcenv.windows.cpp
index 5f6a0ff291..e5c4d7a8db 100644
--- a/src/gc/windows/gcenv.windows.cpp
+++ b/src/gc/windows/gcenv.windows.cpp
@@ -1332,20 +1332,20 @@ bool GCToOSInterface::GetProcessorForHeap(uint16_t heap_number, uint16_t* proc_n
         GroupProcNo groupProcNo(gn, gpn);
         *proc_no = groupProcNo.GetCombinedValue();
 
-        if (GCToOSInterface::CanEnableGCNumaAware())
-        {
-            PROCESSOR_NUMBER procNumber;
+        PROCESSOR_NUMBER procNumber;
 
-            if (CanEnableGCCPUGroups())
-            {
-                procNumber.Group = gn;
-            }
-            else
-            {
-                // Get the current processor group
-                GetCurrentProcessorNumberEx(&procNumber);
-            }
+        if (CanEnableGCCPUGroups())
+        {
+            procNumber.Group = gn;
+        }
+        else
+        {
+            // Get the current processor group
+            GetCurrentProcessorNumberEx(&procNumber);
+        }
 
+        if (GCToOSInterface::CanEnableGCNumaAware())
+        {
             procNumber.Number   = (BYTE)gpn;
             procNumber.Reserved = 0;
 
@@ -1356,7 +1356,7 @@ bool GCToOSInterface::GetProcessorForHeap(uint16_t heap_number, uint16_t* proc_n
         }
         else
         {   // no numa setting, each cpu group is treated as a node
-            *node_no = groupProcNo.GetGroup();
+            *node_no = procNumber.Group;
         }
     }