From 94b1ff08b4822b561f8c27fc3846fce86265b882 Mon Sep 17 00:00:00 2001
From: vsadov <vsadov@microsoft.com>
Date: Thu, 5 Dec 2019 10:55:16 -0800
Subject: [PATCH] Fix GetCurrentProcessorId for  > 64 CPUs on Windows.

---
 src/coreclr/src/vm/comsynchronizable.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/coreclr/src/vm/comsynchronizable.cpp b/src/coreclr/src/vm/comsynchronizable.cpp
index 369c8fd51408b6..02c1e3784d0094 100644
--- a/src/coreclr/src/vm/comsynchronizable.cpp
+++ b/src/coreclr/src/vm/comsynchronizable.cpp
@@ -1450,6 +1450,12 @@ FCIMPL0(INT32, ThreadNative::GetCurrentProcessorNumber)
 {
     FCALL_CONTRACT;
 
+#ifndef FEATURE_PAL
+    PROCESSOR_NUMBER proc_no_cpu_group;
+    GetCurrentProcessorNumberEx(&proc_no_cpu_group);
+    return (proc_no_cpu_group.Group << 6) | proc_no_cpu_group.Number;
+#else
     return ::GetCurrentProcessorNumber();
+#endif //!FEATURE_PAL
 }
 FCIMPLEND;