handle case of Proc Index > MAX_SUPPORTED_CPUS

dotnet · mangod9 · Nov 6, 2024 · Oct 28, 2024 · Oct 29, 2024 · Oct 30, 2024
commit ac25910f48624be0a53697d47f5789a2ff17ab3b
diff --git a/src/coreclr/gc/gc.cpp b/src/coreclr/gc/gc.cpp
@@ -6404,7 +6404,8 @@ class heap_select
         if (GCToOSInterface::CanGetCurrentProcessorNumber())
         {
             uint32_t proc_no = GCToOSInterface::GetCurrentProcessorNumber();
-            proc_no_to_heap_no[proc_no] = (uint16_t)heap_number;
+            // mod proc_no in case it exceeds MAX_SUPPORTED_CPUS
+            proc_no_to_heap_no[proc_no % MAX_SUPPORTED_CPUS] = (uint16_t)heap_number;
         }
     }
 
@@ -6426,7 +6427,8 @@ class heap_select
         if (GCToOSInterface::CanGetCurrentProcessorNumber())
         {
             uint32_t proc_no = GCToOSInterface::GetCurrentProcessorNumber();
-            int adjusted_heap = proc_no_to_heap_no[proc_no];
+            // mod proc_no in case it exceeds MAX_SUPPORTED_CPUS
+            int adjusted_heap = proc_no_to_heap_no[proc_no % MAX_SUPPORTED_CPUS];
             // with dynamic heap count, need to make sure the value is in range.
             if (adjusted_heap >= gc_heap::n_heaps)
             {