commit ee6c1b17ca966995539ce3e29fb416ec1a93beef
author Santiago Aboy Solanes <solanes@google.com> Mon Nov 01 16:27:23 2021 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 01 17:49:42 2021 +0000
tree 60e656b54f866d9480258090f4daf1b61843a5e8
parent 295ed5ae30dae8bb902628667d7aa276ea2c21a2

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

runtime/entrypoints/entrypoint_utils-inl.h

diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h
index 5b931a1..18e6c49 100644
--- a/runtime/entrypoints/entrypoint_utils-inl.h
+++ b/runtime/entrypoints/entrypoint_utils-inl.h
@@ -101,7 +101,7 @@
       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