From 32b8c8f33ad68982357c1fa3d0f132d06b070ab5 Mon Sep 17 00:00:00 2001 From: Santiago Aboy Solanes Date: Thu, 2 Dec 2021 11:50:03 +0000 Subject: Expand sharpening's ComputeLoadClassKind to cover cross-dex cases We can handle some extra cross-dex cases in order to expand the support. Bug: 154012332 Test: ART tests Change-Id: Ic3220d809086b4b3007bf5b6d63789ffb1b91fb9 --- compiler/driver/compiler_options.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/driver/compiler_options.h') diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h index a31be3f640..326e833191 100644 --- a/compiler/driver/compiler_options.h +++ b/compiler/driver/compiler_options.h @@ -26,6 +26,7 @@ #include "base/globals.h" #include "base/hash_set.h" #include "base/macros.h" +#include "base/stl_util.h" #include "base/utils.h" #include "optimizing/register_allocator.h" @@ -374,8 +375,7 @@ class CompilerOptions final { } bool WithinOatFile(const DexFile* dex_file) const { - return std::find(GetDexFilesForOatFile().begin(), GetDexFilesForOatFile().end(), dex_file) != - GetDexFilesForOatFile().end(); + return ContainsElement(GetDexFilesForOatFile(), dex_file); } private: -- cgit v1.2.3-59-g8ed1b