diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-16 17:20:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-16 17:20:07 +0000 |
| commit | 94e480778b0946d1ab405ecf901e5d41ed54cc17 (patch) | |
| tree | a7cce64941d37fe98597a886c40291b6f1ea185f /compiler/optimizing/optimizing_compiler.cc | |
| parent | ea2a45669b807486b0570c66d29a721e684f8d47 (diff) | |
| parent | a3d90fb449e2fba87211a7de323faff63cba41fc (diff) | |
| download | android_art-94e480778b0946d1ab405ecf901e5d41ed54cc17.tar.gz android_art-94e480778b0946d1ab405ecf901e5d41ed54cc17.tar.bz2 android_art-94e480778b0946d1ab405ecf901e5d41ed54cc17.zip | |
Merge "[optimizing] Use baseline when debuggable is set."
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 475d98ce57..e47b4f61b2 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -222,7 +222,8 @@ static const int kMaximumCompilationTimeBeforeWarning = 100; /* ms */ OptimizingCompiler::OptimizingCompiler(CompilerDriver* driver) : Compiler(driver, kMaximumCompilationTimeBeforeWarning), run_optimizations_( - driver->GetCompilerOptions().GetCompilerFilter() != CompilerOptions::kTime), + (driver->GetCompilerOptions().GetCompilerFilter() != CompilerOptions::kTime) + && !driver->GetCompilerOptions().GetDebuggable()), compilation_stats_() {} void OptimizingCompiler::Init() { @@ -463,7 +464,7 @@ CompiledMethod* OptimizingCompiler::Compile(const DexFile::CodeItem* code_item, // For testing purposes, we put a special marker on method names that should be compiled // with this compiler. This makes sure we're not regressing. bool shouldCompile = method_name.find("$opt$") != std::string::npos; - bool shouldOptimize = method_name.find("$opt$reg$") != std::string::npos; + bool shouldOptimize = method_name.find("$opt$reg$") != std::string::npos && run_optimizations_; std::unique_ptr<CodeGenerator> codegen( CodeGenerator::Create(graph, |