diff options
| author | 2018-08-01 15:50:47 +0000 | |
|---|---|---|
| committer | 2018-08-01 15:50:47 +0000 | |
| commit | ee30c5997a41176494750b05d4fb563e730f38c6 (patch) | |
| tree | fb1158993bab2e027984cedab59b402c051a45a7 /runtime/entrypoints/entrypoint_utils.cc | |
| parent | 91f0fdb4372d3f2bcfcd9db67afcbe7ee1901048 (diff) | |
| parent | 8cd54547cec8a4537db5682c2da8be22843b1310 (diff) | |
Merge "Move MethodInfo to CodeInfo."
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.cc')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index a5ebce5f5b..5421f69fbd 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -202,12 +202,11 @@ static inline ArtMethod* DoGetCalleeSaveMethodCaller(ArtMethod* outer_method, DCHECK(current_code->IsOptimized()); uintptr_t native_pc_offset = current_code->NativeQuickPcOffset(caller_pc); CodeInfo code_info(current_code, CodeInfo::DecodeFlags::InlineInfoOnly); - MethodInfo method_info = current_code->GetOptimizedMethodInfo(); StackMap stack_map = code_info.GetStackMapForNativePcOffset(native_pc_offset); DCHECK(stack_map.IsValid()); BitTableRange<InlineInfo> inline_infos = code_info.GetInlineInfosOf(stack_map); if (!inline_infos.empty()) { - caller = GetResolvedMethod(outer_method, method_info, inline_infos); + caller = GetResolvedMethod(outer_method, code_info, inline_infos); } } if (kIsDebugBuild && do_caller_check) { |