Enable inlining of Unsafe methods for x86.
Fixes the calculation of the size of a Mov32AR when the base reg is BP
and the displacement is 0.
Also changes time check in heap from DCHECK to unlikely branch and warning,
since time isn't kept well in the x86 emulator.
Change-Id: If8074610bd3d8ac2e20fb9d5b8066ef23ab94050
diff --git a/src/heap.cc b/src/heap.cc
index 5c96dec..e531dc8 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -1107,7 +1107,9 @@
uint64_t gc_start_time = NanoTime();
uint64_t gc_start_size = GetBytesAllocated();
// Approximate allocation rate in bytes / second.
- DCHECK_NE(gc_start_time, last_gc_time_);
+ if (UNLIKELY(gc_start_time == last_gc_time_)) {
+ LOG(WARNING) << "Timers are broken (gc_start_time == last_gc_time_).";
+ }
uint64_t ms_delta = NsToMs(gc_start_time - last_gc_time_);
if (ms_delta != 0) {
allocation_rate_ = (gc_start_size - last_gc_size_) * 1000 / ms_delta;