diff options
| author | 2015-06-18 21:16:08 -0700 | |
|---|---|---|
| committer | 2015-06-18 21:24:03 -0700 | |
| commit | cad65427d39c8ca9849d49d049ca6d263ada938a (patch) | |
| tree | 431225d33b11d0c23f6f151314c8920f5a0a314b /compiler/optimizing/builder.cc | |
| parent | f12ffdb549f1947125e3f56694cb479a619f02bf (diff) | |
Fix StringChange for optimizing compiler.
Uses optimizing compiler more and fixes x86_64 invoke codegen.
Bug: 21902634
(cherry-picked from commit e0a9a53ec4b4ccbf9b1d67957fb99a45b469ccc2)
Change-Id: I56881889bee7092b8401b090af1c0f1004c11667
Diffstat (limited to 'compiler/optimizing/builder.cc')
| -rw-r--r-- | compiler/optimizing/builder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index 946c0602cf..a70fdc6e20 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -661,7 +661,7 @@ bool HGraphBuilder::BuildInvoke(const Instruction& instruction, (target_method.dex_method_index == outer_compilation_unit_->GetDexMethodIndex()) && (target_method.dex_file == outer_compilation_unit_->GetDexFile()); - if (optimized_invoke_type == kStatic) { + if (optimized_invoke_type == kStatic && !is_string_init) { ScopedObjectAccess soa(Thread::Current()); StackHandleScope<4> hs(soa.Self()); Handle<mirror::DexCache> dex_cache(hs.NewHandle( |