diff options
| author | Brian Smith <brian@dbsoft.org> | 2023-08-14 13:08:41 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2023-08-14 13:08:41 -0500 |
| commit | a0fb8c06de8d4fc97bf38c36affcdc03ab5d8d82 (patch) | |
| tree | ee20ee21016f435cee0c116a17486d2f2520b2aa /js | |
| parent | d16b014115b610e2f741c0f51a61b5643397bcba (diff) | |
| download | uxp-a0fb8c06de8d4fc97bf38c36affcdc03ab5d8d82.tar.gz | |
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.
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/vm/Stopwatch.cpp | 6 | ||||
| -rw-r--r-- | 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 f3985c53aa..84da265a25 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 { uint16_t group_; uint8_t number_; |