diff options
| -rw-r--r-- | compiler/dex/frontend.cc | 4 | ||||
| -rw-r--r-- | compiler/dex/mir_analysis.cc | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/compiler/dex/frontend.cc b/compiler/dex/frontend.cc index a1e2caa651..3f6231cb1f 100644 --- a/compiler/dex/frontend.cc +++ b/compiler/dex/frontend.cc @@ -88,9 +88,7 @@ static CompiledMethod* CompileMethod(CompilerDriver& driver, return nullptr; } - if (!driver.GetCompilerOptions().IsCompilationEnabled()) { - return nullptr; - } + DCHECK(driver.GetCompilerOptions().IsCompilationEnabled()); ClassLinker* class_linker = Runtime::Current()->GetClassLinker(); CompilationUnit cu(driver.GetArenaPool()); diff --git a/compiler/dex/mir_analysis.cc b/compiler/dex/mir_analysis.cc index ee48796996..44f69ba674 100644 --- a/compiler/dex/mir_analysis.cc +++ b/compiler/dex/mir_analysis.cc @@ -1112,14 +1112,11 @@ bool MIRGraph::SkipCompilation(std::string* skip_message) { return true; } - if (!compiler_options.IsCompilationEnabled()) { - *skip_message = "Compilation disabled"; - return true; - } + DCHECK(compiler_options.IsCompilationEnabled()); // Set up compilation cutoffs based on current filter mode. - size_t small_cutoff = 0; - size_t default_cutoff = 0; + size_t small_cutoff; + size_t default_cutoff; switch (compiler_filter) { case CompilerOptions::kBalanced: small_cutoff = compiler_options.GetSmallMethodThreshold(); @@ -1136,6 +1133,7 @@ bool MIRGraph::SkipCompilation(std::string* skip_message) { break; default: LOG(FATAL) << "Unexpected compiler_filter_: " << compiler_filter; + UNREACHABLE(); } // If size < cutoff, assume we'll compile - but allow removal. |