diff options
| author | 2015-07-13 11:55:19 +0000 | |
|---|---|---|
| committer | 2015-07-13 11:55:20 +0000 | |
| commit | f185fb365e9faf58428762bace96d7729ea5bdbc (patch) | |
| tree | 79a2bbbab8cb36523056539d374d5d79e7e5ee4a /compiler/optimizing/optimizing_compiler.cc | |
| parent | 5e094de24827292d8a13be2adbdcca54ae7d5ff0 (diff) | |
| parent | 2e7cd752452d02499a2f5fbd604c5427aa372f00 (diff) | |
Merge "[optimizing] Don't rely on the verifier for String.<init>."
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 1e515307b4..4568a463db 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -627,7 +627,7 @@ CompiledMethod* OptimizingCompiler::TryCompile(const DexFile::CodeItem* code_ite // `run_optimizations_` is set explicitly (either through a compiler filter // or the debuggable flag). If it is set, we can run baseline. Otherwise, we fall back // to Quick. - bool can_use_baseline = !run_optimizations_; + bool can_use_baseline = !run_optimizations_ && builder.CanUseBaselineForStringInit(); if (run_optimizations_ && can_optimize && can_allocate_registers) { VLOG(compiler) << "Optimizing " << method_name; |