diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-09-14 16:52:41 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-09-14 14:57:58 +0000 |
| commit | 1ca3e7634f3989aec9631cfbcfd5a46bde4ebf24 (patch) | |
| tree | c9faa91be97094e1451ae126819a3672bd7358de /chromium/v8/src/base | |
| parent | e20ba3c57b50674f625b5088faa0fe9a076c0617 (diff) | |
| download | qtwebengine-chromium-1ca3e7634f3989aec9631cfbcfd5a46bde4ebf24.tar.gz | |
BASELINE: Update Chromium to 53.0.2785.117
Change-Id: Ie4ea15fc770a1973f58739ce99df06c98d3dda79
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/v8/src/base')
| -rw-r--r-- | chromium/v8/src/base/ieee754.cc | 2 | ||||
| -rw-r--r-- | chromium/v8/src/base/platform/time.cc | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/chromium/v8/src/base/ieee754.cc b/chromium/v8/src/base/ieee754.cc index dd86353bbfb..b7178cad301 100644 --- a/chromium/v8/src/base/ieee754.cc +++ b/chromium/v8/src/base/ieee754.cc @@ -609,7 +609,7 @@ recompute: j = 0; for (i = jz - 1; i >= jk; i--) j |= iq[i]; if (j == 0) { /* need recomputation */ - for (k = 1; iq[jk - k] == 0; k++) { + for (k = 1; jk >= k && iq[jk - k] == 0; k++) { /* k = no. of terms needed */ } diff --git a/chromium/v8/src/base/platform/time.cc b/chromium/v8/src/base/platform/time.cc index f71af151655..786ef2e6c2e 100644 --- a/chromium/v8/src/base/platform/time.cc +++ b/chromium/v8/src/base/platform/time.cc @@ -56,6 +56,17 @@ int64_t ComputeThreadTicks() { V8_INLINE int64_t ClockNow(clockid_t clk_id) { #if (defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0) || \ defined(V8_OS_BSD) || defined(V8_OS_ANDROID) +// On AIX clock_gettime for CLOCK_THREAD_CPUTIME_ID outputs time with +// resolution of 10ms. thread_cputime API provides the time in ns +#if defined(V8_OS_AIX) + thread_cputime_t tc; + if (clk_id == CLOCK_THREAD_CPUTIME_ID) { + if (thread_cputime(-1, &tc) != 0) { + UNREACHABLE(); + return 0; + } + } +#endif struct timespec ts; if (clock_gettime(clk_id, &ts) != 0) { UNREACHABLE(); @@ -63,7 +74,15 @@ V8_INLINE int64_t ClockNow(clockid_t clk_id) { } v8::base::internal::CheckedNumeric<int64_t> result(ts.tv_sec); result *= v8::base::Time::kMicrosecondsPerSecond; +#if defined(V8_OS_AIX) + if (clk_id == CLOCK_THREAD_CPUTIME_ID) { + result += (tc.stime / v8::base::Time::kNanosecondsPerMicrosecond); + } else { + result += (ts.tv_nsec / v8::base::Time::kNanosecondsPerMicrosecond); + } +#else result += (ts.tv_nsec / v8::base::Time::kNanosecondsPerMicrosecond); +#endif return result.ValueOrDie(); #else // Monotonic clock not supported. return 0; |