Skip to content

Commit 353b747

Browse files
committed
---
yaml --- r: 91645 b: refs/heads/auto c: 36afd60 h: refs/heads/master i: 91643: 223bf40 v: v3
1 parent bca0fe2 commit 353b747

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 61f76a51300fd61369255850a41e04720681fcf8
16+
refs/heads/auto: 36afd606091a708e9a5676c7fb2e4cdc47b9abfd
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/rt/rust_builtin.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,16 @@ precise_time_ns(uint64_t *ns) {
217217
uint64_t time_nano = time * (info.numer / info.denom);
218218
*ns = time_nano;
219219
#elif __WIN32__
220-
int64_t ticks_per_s;
221-
QueryPerformanceFrequency((LARGE_INTEGER *)&ticks_per_s);
222-
if (ticks_per_s == 0LL) {
223-
ticks_per_s = 1LL;
220+
LARGE_INTEGER ticks_per_s;
221+
BOOL query_result = QueryPerformanceFrequency(&ticks_per_s);
222+
assert(query_result);
223+
if (ticks_per_s.QuadPart == 0LL) {
224+
ticks_per_s.QuadPart = 1LL;
224225
}
225-
int64_t ticks;
226-
QueryPerformanceCounter((LARGE_INTEGER *)&ticks);
227-
*ns = (uint64_t)((ticks * ns_per_s) / ticks_per_s);
226+
LARGE_INTEGER ticks;
227+
query_result = QueryPerformanceCounter(&ticks);
228+
assert(query_result);
229+
*ns = (uint64_t)((ticks.QuadPart * ns_per_s) / ticks_per_s.QuadPart);
228230
#else
229231
timespec ts;
230232
clock_gettime(CLOCK_MONOTONIC, &ts);

0 commit comments

Comments
 (0)