commit 7ab07777b08db86dda2891f3e7ae15df8f25a599
author Nicolas Geoffray <ngeoffray@google.com> Fri Aug 30 08:26:59 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Aug 30 08:57:20 2019 +0000
tree 1b0b2fa585e49e4a7913c09d67794763197c6490
parent 154445799432cb53d23cd011485132be07c39b5a

Revert "Prevent overflow for AOT hotness counters"

This reverts commit 79e6eb8b79be6249358b7801bc511290dacf10d0.

Bug: 139883463

Reason for revert: 674-hotness-compiled fails on target.

Change-Id: I02fce74d70a4ae69dd5b4ae3924aa11728d9e16f

runtime/art_method.h

diff --git a/runtime/art_method.h b/runtime/art_method.h
index d84ea7c..450fe41 100644
--- a/runtime/art_method.h
+++ b/runtime/art_method.h
@@ -18,7 +18,6 @@
 #define ART_RUNTIME_ART_METHOD_H_
 
 #include <cstddef>
-#include <limits>
 
 #include <android-base/logging.h>
 #include <jni.h>
@@ -674,14 +673,10 @@
   void CopyFrom(ArtMethod* src, PointerSize image_pointer_size)
       REQUIRES_SHARED(Locks::mutator_lock_);
 
-  ALWAYS_INLINE void SetCounter(uint16_t hotness_count) REQUIRES_SHARED(Locks::mutator_lock_);
+  ALWAYS_INLINE void SetCounter(int16_t hotness_count) REQUIRES_SHARED(Locks::mutator_lock_);
 
   ALWAYS_INLINE uint16_t GetCounter() REQUIRES_SHARED(Locks::mutator_lock_);
 
-  ALWAYS_INLINE static constexpr uint16_t MaxCounter() {
-    return std::numeric_limits<decltype(hotness_count_)>::max();
-  }
-
   ALWAYS_INLINE uint32_t GetImtIndex() REQUIRES_SHARED(Locks::mutator_lock_);
 
   void CalculateAndSetImtIndex() REQUIRES_SHARED(Locks::mutator_lock_);