diff options
| author | 2018-06-06 00:24:22 +0000 | |
|---|---|---|
| committer | 2018-06-06 00:24:22 +0000 | |
| commit | f51359edab8cd1a77677e68f0f2b56dc0f5d2561 (patch) | |
| tree | 8b03fb414afac9cac2746eaaac9cd3330f1c097b /runtime/entrypoints/entrypoint_utils.cc | |
| parent | a13ec547911bb33d05955d9d6f336f550c8d9c10 (diff) | |
| parent | 6e69e52a12883386f91d014324bebee867ca7877 (diff) | |
Merge "Remove depth argument from InlineInfo accessors in stack maps."
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.cc')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index 7f9b385a0a..e71d1fa38a 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -205,12 +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()); - if (stack_map.HasInlineInfo()) { - InlineInfo inline_info = code_info.GetInlineInfoOf(stack_map); - caller = GetResolvedMethod(outer_method, - method_info, - inline_info, - inline_info.GetDepth() - 1); + uint32_t depth = code_info.GetInlineDepthOf(stack_map); + if (depth != 0) { + caller = GetResolvedMethod(outer_method, method_info, code_info, stack_map, depth - 1); } } if (kIsDebugBuild && do_caller_check) { |