commit b2feaafd89813af69c65da95e0b51b1a4cecaf0b
author Sebastien Hertz <shertz@google.com> Mon Oct 12 13:40:10 2015 +0000
committer Sebastien Hertz <shertz@google.com> Mon Oct 12 18:12:23 2015 +0200
tree fafb1cc4b764aface48448f0ccd906ffdff0afdc
parent 34ce73a962379b7b844c605f1c4c80cf133009e3

Revert "Revert "Fix instrumentation frame check with inlining""

This reverts commit e3e2fe5ecc16184ba91018adb3bfbec1c5880c29.

Fixes an incorrect CHECK_GT into CHECK_GE in method
Instrumentation::ComputeFrameId.

Bug: 22519499
Change-Id: I0a11d378f3baa728b9176ff086fe4b835b30bb46

runtime/instrumentation.h

diff --git a/runtime/instrumentation.h b/runtime/instrumentation.h
index 612ca14..8dd2357 100644
--- a/runtime/instrumentation.h
+++ b/runtime/instrumentation.h
@@ -397,6 +397,11 @@
       SHARED_REQUIRES(Locks::mutator_lock_)
       REQUIRES(!Locks::thread_list_lock_);
 
+  static size_t ComputeFrameId(Thread* self,
+                               size_t frame_depth,
+                               size_t inlined_frames_before_frame)
+      SHARED_REQUIRES(Locks::mutator_lock_);
+
  private:
   InstrumentationLevel GetCurrentInstrumentationLevel() const;