From: Nicolas Geoffray <ngeoffray@google.com>
Date: Sun, 7 Feb 2016 12:48:28 +0000 (+0000)
Subject: Always visit ProfilingInfo, the counter could be reset.
X-Git-Tag: android-x86-7.1-r1~414
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=87170e7641;p=android-x86%2Fart.git

Always visit ProfilingInfo, the counter could be reset.

The counter could be reset or overflow, but we may have
inline caches populated.

bug:26775558

(cherry picked from commit ef404468d727332b088e6d461d0cf2f0ce0a897a)

Change-Id: Ib0cc8da05aa75d50c0474a1ddcb88cd60ae34707
---

diff --git a/runtime/art_method-inl.h b/runtime/art_method-inl.h
index 28540c843..cc45c385b 100644
--- a/runtime/art_method-inl.h
+++ b/runtime/art_method-inl.h
@@ -463,9 +463,11 @@ void ArtMethod::VisitRoots(RootVisitorType& visitor, size_t pointer_size) {
   }
 
   visitor.VisitRootIfNonNull(declaring_class_.AddressWithoutBarrier());
-  ProfilingInfo* profiling_info = GetProfilingInfo(pointer_size);
-  if (hotness_count_ != 0 && !IsNative() && profiling_info != nullptr) {
-    profiling_info->VisitRoots(visitor);
+  if (!IsNative()) {
+    ProfilingInfo* profiling_info = GetProfilingInfo(pointer_size);
+    if (profiling_info != nullptr) {
+      profiling_info->VisitRoots(visitor);
+    }
   }
 }