diff options
| author | 2018-07-02 19:30:18 +0100 | |
|---|---|---|
| committer | 2018-07-04 14:23:12 +0100 | |
| commit | 93bd3619de4616040d672a4ed3825976bed4bfce (patch) | |
| tree | 2ab3424374ed3d316053ed8e9ec2d4b95ea2ef4d /runtime/entrypoints/entrypoint_utils.cc | |
| parent | f07d5617770c37d87447c8bddf105eb0469ab093 (diff) | |
Use iterators to access stack map data.
Try to simplify the code using the recently added iterators.
Test: test-art-host-gtest-stack_map_test
Change-Id: I0b9f54df01749ee6ec3a67cfb07ba636a2489c89
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 e71d1fa38a..9e6c642f14 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) { |