commit 7c9cfe8b3f986e7cbc18350ad7b9b72f58f5846c
author Nicolas Geoffray <ngeoffray@google.com> Mon Nov 25 17:40:21 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Nov 26 10:31:02 2019 +0000
tree 838641fd0cecba43abb2a1382aa41c4e2ccc00f1
parent d3ed4ada0d2bf6ffa0e997692734fe5016d365e3

Honor the --baseline flag for the JIT.

Test: art -Xcompiler-option --baseline uses the baseline compiler.
Change-Id: I2a5a3ed0038ca965ab1f0cebffb7900e90bae43a

compiler/optimizing/optimizing_compiler.cc

diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index a45f502..3f11170 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -1375,7 +1375,7 @@
                    &code_allocator,
                    dex_compilation_unit,
                    method,
-                   baseline,
+                   baseline || GetCompilerOptions().IsBaseline(),
                    osr,
                    /* is_shared_jit_code= */ code_cache->IsSharedRegion(*region),
                    &handles));