From 9f80f52d0aec0a55b8877cf1d796c8ff41e8039a Mon Sep 17 00:00:00 2001
From: Brian Smith <brian@dbsoft.org>
Date: Mon, 14 Aug 2023 13:08:41 -0500
Subject: [PATCH] Issue #2255 - Disable untested code path in
 Stopwatch.(h|cpp). https://bugzilla.mozilla.org/show_bug.cgi?id=1325299
 Multiprocessor support in Windows returned bogus times causing debug asserts.
 This may or may not be related to the issue but found it trying to debug it.

---
 js/src/vm/Stopwatch.cpp | 6 ++++--
 js/src/vm/Stopwatch.h   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/js/src/vm/Stopwatch.cpp b/js/src/vm/Stopwatch.cpp
index 46841b27f8..2c267d446d 100644
--- a/js/src/vm/Stopwatch.cpp
+++ b/js/src/vm/Stopwatch.cpp
@@ -409,7 +409,8 @@ AutoStopwatch::getCycles(JSRuntime* runtime) const
 cpuid_t inline
 AutoStopwatch::getCPU() const
 {
-#if defined(XP_WIN) && WINVER >= _WIN32_WINNT_VISTA
+// Temporary disable untested code path. Issue #2255
+#if 0 //defined(XP_WIN) && WINVER >= _WIN32_WINNT_VISTA
     PROCESSOR_NUMBER proc;
     GetCurrentProcessorNumberEx(&proc);
 
@@ -423,7 +424,8 @@ AutoStopwatch::getCPU() const
 bool inline
 AutoStopwatch::isSameCPU(const cpuid_t& a, const cpuid_t& b) const
 {
-#if defined(XP_WIN)  && WINVER >= _WIN32_WINNT_VISTA
+// Temporary disable untested code path. Issue #2255
+#if 0 //defined(XP_WIN)  && WINVER >= _WIN32_WINNT_VISTA
     return a.group_ == b.group_ && a.number_ == b.number_;
 #else
     return true;
diff --git a/js/src/vm/Stopwatch.h b/js/src/vm/Stopwatch.h
index 5658a05726..c7b4e3457f 100644
--- a/js/src/vm/Stopwatch.h
+++ b/js/src/vm/Stopwatch.h
@@ -271,7 +271,8 @@ struct PerformanceMonitoring {
     uint64_t highestTimestampCounter_;
 };
 
-#if WINVER >= 0x0600
+// Temporary disable untested code path. Issue #2255
+#if 0 // WINVER >= 0x0600
 struct cpuid_t {
     WORD group_;
     BYTE number_;