From f4034625860d2070e6902db82830120b16ed6402 Mon Sep 17 00:00:00 2001 From: Santiago Aboy Solanes Date: Fri, 8 Mar 2024 15:19:24 +0000 Subject: Revert^2 "Remove Compiler::Kind" This reverts commit f66031b556c386f582eab39b5c616104d77fc375. Reason for revert: The original CL got reverted due to a conflict with aosp/2919307. That other CL got reverted so we can reland as-is. Bug: 289199192 Change-Id: Ibe75708b00eac32210ac37655fc16e6ee6880368 Test: art/test/testrunner/testrunner.py --host --64 --optimizing -b --- compiler/common_compiler_test.cc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'compiler/common_compiler_test.cc') diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc index d2cf3aef3c..8c05888215 100644 --- a/compiler/common_compiler_test.cc +++ b/compiler/common_compiler_test.cc @@ -255,14 +255,6 @@ void CommonCompilerTestImpl::SetUpRuntimeOptionsImpl() { ApplyInstructionSet(); } -Compiler::Kind CommonCompilerTestImpl::GetCompilerKind() const { - return compiler_kind_; -} - -void CommonCompilerTestImpl::SetCompilerKind(Compiler::Kind compiler_kind) { - compiler_kind_ = compiler_kind; -} - void CommonCompilerTestImpl::TearDown() { code_and_metadata_.clear(); compiler_options_.reset(); @@ -278,8 +270,7 @@ void CommonCompilerTestImpl::CompileMethod(ArtMethod* method) { DCHECK(!Runtime::Current()->IsStarted()); Thread* self = Thread::Current(); StackHandleScope<2> hs(self); - std::unique_ptr compiler( - Compiler::Create(*compiler_options_, &storage, compiler_kind_)); + std::unique_ptr compiler(Compiler::Create(*compiler_options_, &storage)); const DexFile& dex_file = *method->GetDexFile(); Handle dex_cache = hs.NewHandle(GetClassLinker()->FindDexCache(self, dex_file)); -- cgit v1.2.3-59-g8ed1b