From efc3f02504e8e3768cc18ab5347c5a6d19d6a935 Mon Sep 17 00:00:00 2001
From: David Brazdil <dbrazdil@google.com>
Date: Wed, 28 Oct 2015 12:19:06 -0500
Subject: ART: Fix deopt from optimized code under inlining

Deoptimization of inlined frames would use the outer method's
vreg map, thus starting interpreter in bogus state.

Bug: 25331616
Change-Id: I1d4aefc731bb1386f3e6186a89b59981836480b3
---
 runtime/stack.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'runtime/stack.h')

diff --git a/runtime/stack.h b/runtime/stack.h
index 1276b244e7..aa7b6160fe 100644
--- a/runtime/stack.h
+++ b/runtime/stack.h
@@ -698,6 +698,10 @@ class StackVisitor {
     return current_inlining_depth_ != 0;
   }
 
+  size_t GetCurrentInliningDepth() const {
+    return current_inlining_depth_;
+  }
+
   uintptr_t GetCurrentQuickFramePc() const {
     return cur_quick_frame_pc_;
   }
-- 
cgit v1.2.3-59-g8ed1b