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

1 files changed, 2 insertions, 13 deletions

diff --git a/compiler/compiler.cc b/compiler/compiler.cc
index 0e040ac54a..9cbd65d89d 100644
--- a/compiler/compiler.cc
+++ b/compiler/compiler.cc
@@ -27,22 +27,11 @@
 
 namespace art HIDDEN {
 
-Compiler* Compiler::Create(const CompilerOptions& compiler_options,
-                           CompiledCodeStorage* storage,
-                           Compiler::Kind kind) {
+Compiler* Compiler::Create(const CompilerOptions& compiler_options, CompiledCodeStorage* storage) {
   // Check that oat version when runtime was compiled matches the oat version of the compiler.
   constexpr std::array<uint8_t, 4> compiler_oat_version = OatHeader::kOatVersion;
   OatHeader::CheckOatVersion(compiler_oat_version);
-  switch (kind) {
-    case kQuick:
-      // TODO: Remove Quick in options.
-    case kOptimizing:
-      return CreateOptimizingCompiler(compiler_options, storage);
-
-    default:
-      LOG(FATAL) << "UNREACHABLE";
-      UNREACHABLE();
-  }
+  return CreateOptimizingCompiler(compiler_options, storage);
 }
 
 bool Compiler::IsPathologicalCase(const dex::CodeItem& code_item,