summaryrefslogtreecommitdiff
path: root/runtime/stack.h
diff options
context:
space:
mode:
author David Brazdil <dbrazdil@google.com> 2015-10-28 12:19:06 -0500
committer David Brazdil <dbrazdil@google.com> 2015-10-28 20:16:06 -0500
commitefc3f02504e8e3768cc18ab5347c5a6d19d6a935 (patch)
tree43dcd255401c6270b83ef83a95a5ab00416ad535 /runtime/stack.h
parent5f2e628b280dfc5f8385e489d44cc0960fcea484 (diff)
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
Diffstat (limited to 'runtime/stack.h')
-rw-r--r--runtime/stack.h4
1 files changed, 4 insertions, 0 deletions
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_;
}