From ee6c1b17ca966995539ce3e29fb416ec1a93beef Mon Sep 17 00:00:00 2001 From: Santiago Aboy Solanes Date: Mon, 1 Nov 2021 16:27:23 +0000 Subject: 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/entrypoints/entrypoint_utils-inl.h') 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 -- cgit v1.2.3-59-g8ed1b