summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Santiago Aboy Solanes <solanes@google.com> 2021-11-01 16:27:23 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> 2021-11-01 17:49:42 +0000
commitee6c1b17ca966995539ce3e29fb416ec1a93beef (patch)
tree60e656b54f866d9480258090f4daf1b61843a5e8
parent295ed5ae30dae8bb902628667d7aa276ea2c21a2 (diff)
Update entrypoint_utils check method -> other_method
We updated the code in entrypoint_utils but forgot to update a check in that same file. Bug: 204767291, 154012332 Change-Id: Ie5f4328a1fa294efa2e48d287ad8fa7a5f99c812
-rw-r--r--runtime/entrypoints/entrypoint_utils-inl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h
index 5b931a15be..18e6c493d7 100644
--- a/runtime/entrypoints/entrypoint_utils-inl.h
+++ b/runtime/entrypoints/entrypoint_utils-inl.h
@@ -101,7 +101,7 @@ inline ArtMethod* GetResolvedMethod(ArtMethod* outer_method,
UNREACHABLE();
}
DCHECK(!inlined_method->IsRuntimeMethod());
- if (UNLIKELY(inlined_method->GetDexFile() != method->GetDexFile() &&
+ if (UNLIKELY(inlined_method->GetDexFile() != outer_method->GetDexFile() &&
!method_info.HasDexFileIndex())) {
// TODO: We could permit inlining within a multi-dex oat file and the boot image,
// even going back from boot image methods to the same oat file. However, this is