summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gc/env/gcenv.base.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/gc/env/gcenv.base.h b/src/gc/env/gcenv.base.h
index e1d40d6003..b695abc7fa 100644
--- a/src/gc/env/gcenv.base.h
+++ b/src/gc/env/gcenv.base.h
@@ -253,12 +253,18 @@ inline uint8_t BitScanForward64(uint32_t *bitIndex, uint64_t mask)
uint32_t hi = (mask >> 32) & 0xFFFFFFFF;
uint32_t lo = mask & 0xFFFFFFFF;
uint32_t fakeBitIndex = 0;
- if (BitScanForward(&fakeBitIndex, hi))
+
+ uint8_t result = BitScanForward(bitIndex, lo);
+ if (result == 0)
{
- *bitIndex = fakeBitIndex + 32;
+ result = BitScanForward(&fakeBitIndex, hi);
+ if (result != 0)
+ {
+ *bitIndex = fakeBitIndex + 32;
+ }
}
- return BitScanForward(bitIndex, lo);
+ return result;
#else
return _BitScanForward64((unsigned long*)bitIndex, mask);
#endif // _WIN32