diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-09-29 18:00:03 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-09-30 09:05:15 +0100 |
| commit | 1920c1036ebe6dcdc93959714c9fdcedc199baf0 (patch) | |
| tree | e36976aea8f789ceb037b66308d1ec84a0421772 /compiler/optimizing/optimizing_compiler.cc | |
| parent | 0766e3ff5638b14d6b3ea6157c800eed11be5b98 (diff) | |
Revert "Revert "Enable optimizations with --debuggable.""
This reverts commit b7d27a53cb280a943c0a63a9e0806cf8e3ae4cde.
Change-Id: I398c23863e4fd86a3112076417378d22efd08306
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index a2b613194f..dbfbd96e39 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -321,8 +321,7 @@ static const int kMaximumCompilationTimeBeforeWarning = 100; /* ms */ OptimizingCompiler::OptimizingCompiler(CompilerDriver* driver) : Compiler(driver, kMaximumCompilationTimeBeforeWarning), run_optimizations_( - (driver->GetCompilerOptions().GetCompilerFilter() != CompilerOptions::kTime) - && !driver->GetCompilerOptions().GetDebuggable()), + driver->GetCompilerOptions().GetCompilerFilter() != CompilerOptions::kTime), delegate_(Create(driver, Compiler::Kind::kQuick)) {} void OptimizingCompiler::Init() { @@ -575,12 +574,6 @@ CompiledMethod* OptimizingCompiler::CompileOptimized(HGraph* graph, CompilerDriver* compiler_driver, const DexCompilationUnit& dex_compilation_unit, PassObserver* pass_observer) const { - if (graph->HasTryCatch() && graph->IsDebuggable()) { - // TODO: b/24054676, stop creating catch phis eagerly to avoid special cases like phis without - // inputs. - return nullptr; - } - ScopedObjectAccess soa(Thread::Current()); StackHandleScopeCollection handles(soa.Self()); soa.Self()->TransitionFromRunnableToSuspended(kNative); |