Revert "Revert "Make clang the default compiler on host.""
This reverts commit d54f3a6219bca6ae018f4395fa0f1254bd4459be.
Change-Id: Id96bb52a0d599f8848010d1589bdf0f70fc7124b
diff --git a/compiler/dex/frontend.cc b/compiler/dex/frontend.cc
index 243395a..3bd71d1 100644
--- a/compiler/dex/frontend.cc
+++ b/compiler/dex/frontend.cc
@@ -144,6 +144,12 @@
return NULL;
}
+ const CompilerOptions& compiler_options = driver.GetCompilerOptions();
+ CompilerOptions::CompilerFilter compiler_filter = compiler_options.GetCompilerFilter();
+ if (compiler_filter == CompilerOptions::kInterpretOnly) {
+ return nullptr;
+ }
+
ClassLinker* class_linker = Runtime::Current()->GetClassLinker();
CompilationUnit cu(driver.GetArenaPool());
@@ -210,9 +216,6 @@
cu.mir_graph->EnableOpcodeCounting();
}
- const CompilerOptions& compiler_options = cu.compiler_driver->GetCompilerOptions();
- CompilerOptions::CompilerFilter compiler_filter = compiler_options.GetCompilerFilter();
-
// Check early if we should skip this compilation if using the profiled filter.
if (cu.compiler_driver->ProfilePresent()) {
std::string methodname = PrettyMethod(method_idx, dex_file);