diff options
| author | 2018-07-05 00:03:21 +0000 | |
|---|---|---|
| committer | 2018-07-05 00:03:21 +0000 | |
| commit | a296f908e186398ff413c78f2460cb3138e531ab (patch) | |
| tree | 04592d0bcf8afac399dc562efdcac491072366eb /runtime/entrypoints/entrypoint_utils.cc | |
| parent | b275072ddfb1bfcacc914aff08cb0f5774000258 (diff) | |
| parent | 93bd3619de4616040d672a4ed3825976bed4bfce (diff) | |
Merge "Use iterators to access stack map data."
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.cc')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index d902455c00..0c61965908 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -205,9 +205,9 @@ static inline ArtMethod* DoGetCalleeSaveMethodCaller(ArtMethod* outer_method, MethodInfo method_info = current_code->GetOptimizedMethodInfo(); StackMap stack_map = code_info.GetStackMapForNativePcOffset(native_pc_offset); DCHECK(stack_map.IsValid()); - uint32_t depth = code_info.GetInlineDepthOf(stack_map); - if (depth != 0) { - caller = GetResolvedMethod(outer_method, method_info, code_info, stack_map, depth - 1); + BitTableRange<InlineInfo> inline_infos = code_info.GetInlineInfosOf(stack_map); + if (!inline_infos.empty()) { + caller = GetResolvedMethod(outer_method, method_info, inline_infos); } } if (kIsDebugBuild && do_caller_check) { |