commit 86f052abfd0a6cc8053d0fd052067144fbbd1955
author Nicolas Geoffray <ngeoffray@google.com> Sun Feb 07 12:48:28 2016 +0000
committer The Android Automerger <android-build@google.com> Wed Feb 10 16:23:58 2016 -0800
tree bc9049a7f85c39194bb6f2f3012d88a2ba29d640
parent 39e1fbf257c8a46db2bd37f6b6b4599186b0e712

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

runtime/art_method-inl.h

diff --git a/runtime/art_method-inl.h b/runtime/art_method-inl.h
index 28540c8..cc45c38 100644
--- a/runtime/art_method-inl.h
+++ b/runtime/art_method-inl.h
@@ -463,9 +463,11 @@
   }
 
   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);
+    }
   }
 }