From ee7bd3293c93f812f3403325f621ed73ad607ae4 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 17 Jan 2022 09:17:23 +0000 Subject: Revert "Expand sharpening's ComputeLoadClassKind to cover cross-dex cases" This reverts commit 32b8c8f33ad68982357c1fa3d0f132d06b070ab5. Bug: 154012332 Bug: 214850438 Reason for revert: b/214850438 Change-Id: I479c0910ce5da593e170bc5e4f6fa10dfe5d67b2 --- 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 326e833191..a31be3f640 100644 --- a/compiler/driver/compiler_options.h +++ b/compiler/driver/compiler_options.h @@ -26,7 +26,6 @@ #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" @@ -375,7 +374,8 @@ class CompilerOptions final { } bool WithinOatFile(const DexFile* dex_file) const { - return ContainsElement(GetDexFilesForOatFile(), dex_file); + return std::find(GetDexFilesForOatFile().begin(), GetDexFilesForOatFile().end(), dex_file) != + GetDexFilesForOatFile().end(); } private: -- cgit v1.2.3-59-g8ed1b