wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-22 15:17:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

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.

Browse source
This commit is contained in:
Brian Smith 2023-08-14 13:08:41 -05:00 • committed by roytam1
commit 9f80f52d0a
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/src/vm/Stopwatch.cpp
View file

@ -409,7 +409,8 @@ AutoStopwatch::getCycles(JSRuntime* runtime) const
cpuid_t inline cpuid_t inline
AutoStopwatch::getCPU() const 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; PROCESSOR_NUMBER proc;
GetCurrentProcessorNumberEx(&proc); GetCurrentProcessorNumberEx(&proc);
@ -423,7 +424,8 @@ AutoStopwatch::getCPU() const
bool inline bool inline
AutoStopwatch::isSameCPU(const cpuid_t& a, const cpuid_t& b) const 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_; return a.group_ == b.group_ && a.number_ == b.number_;
#else #else
return true; return true;

3
js/src/vm/Stopwatch.h
View file

@ -271,7 +271,8 @@ struct PerformanceMonitoring {
uint64_t highestTimestampCounter_; uint64_t highestTimestampCounter_;
}; };
#if WINVER >= 0x0600 // Temporary disable untested code path. Issue #2255
#if 0 // WINVER >= 0x0600
struct cpuid_t { struct cpuid_t {
WORD group_; WORD group_;
BYTE number_; BYTE number_;