commit 45bf250d61de433c18ded824348e87bd4ffd7678
author Mathieu Chartier <mathieuc@google.com> Thu Mar 31 11:07:09 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Mar 31 14:51:09 2016 -0700
tree 1b79913ff99218dcfe1fc124d05ec403c871418f
parent 68724122b444e531d65413b1d9039f6e5fca52b3

Add way to disable resolving for stack walk

Only occurs for walking the inlined frames case.

Bug: 27857910

(cherry picked from commit be2892bf771435eb451c74297b553f7dc9fea4ca)

Change-Id: Ied92be96f2f74ba02c02168f704443b95e7a4b04

runtime/stack.cc

diff --git a/runtime/stack.cc b/runtime/stack.cc
index ee5da8e..57ce07d 100644
--- a/runtime/stack.cc
+++ b/runtime/stack.cc
@@ -130,7 +130,11 @@
     if (IsInInlinedFrame()) {
       size_t depth_in_stack_map = current_inlining_depth_ - 1;
       InlineInfo inline_info = GetCurrentInlineInfo();
-      return GetResolvedMethod(*GetCurrentQuickFrame(), inline_info, depth_in_stack_map);
+      DCHECK(walk_kind_ != StackWalkKind::kSkipInlinedFrames);
+      bool allow_resolve = walk_kind_ != StackWalkKind::kIncludeInlinedFramesNoResolve;
+      return allow_resolve
+          ? GetResolvedMethod<true>(*GetCurrentQuickFrame(), inline_info, depth_in_stack_map)
+          : GetResolvedMethod<false>(*GetCurrentQuickFrame(), inline_info, depth_in_stack_map);
     } else {
       return *cur_quick_frame_;
     }
@@ -859,7 +863,8 @@
         cur_oat_quick_method_header_ = method->GetOatQuickMethodHeader(cur_quick_frame_pc_);
         SanityCheckFrame();
 
-        if ((walk_kind_ == StackWalkKind::kIncludeInlinedFrames)
+        if ((walk_kind_ == StackWalkKind::kIncludeInlinedFrames ||
+             walk_kind_ == StackWalkKind::kIncludeInlinedFramesNoResolve)
             && (cur_oat_quick_method_header_ != nullptr)
             && cur_oat_quick_method_header_->IsOptimized()) {
           CodeInfo code_info = cur_oat_quick_method_header_->GetOptimizedCodeInfo();