From 7c9cfe8b3f986e7cbc18350ad7b9b72f58f5846c Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Mon, 25 Nov 2019 17:40:21 +0000
Subject: Honor the --baseline flag for the JIT.

Test: art -Xcompiler-option --baseline uses the baseline compiler.
Change-Id: I2a5a3ed0038ca965ab1f0cebffb7900e90bae43a
---
 compiler/optimizing/optimizing_compiler.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'compiler/optimizing/optimizing_compiler.cc')

diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index a45f5025d8..3f11170c66 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -1375,7 +1375,7 @@ bool OptimizingCompiler::JitCompile(Thread* self,
                    &code_allocator,
                    dex_compilation_unit,
                    method,
-                   baseline,
+                   baseline || GetCompilerOptions().IsBaseline(),
                    osr,
                    /* is_shared_jit_code= */ code_cache->IsSharedRegion(*region),
                    &handles));
-- 
cgit v1.2.3-59-g8ed1b