diff options
| author | Jeff Hao <jeffhao@google.com> | 2015-06-18 21:16:08 -0700 |
|---|---|---|
| committer | Jeff Hao <jeffhao@google.com> | 2015-06-18 21:16:08 -0700 |
| commit | e0a9a53ec4b4ccbf9b1d67957fb99a45b469ccc2 (patch) | |
| tree | 667b78b1d9261d448baa14cb7dc4602138f1237c /compiler/optimizing/builder.cc | |
| parent | bf1fa2ccb5e7409910b99dc46b616e44c66ade68 (diff) | |
| download | android_art-e0a9a53ec4b4ccbf9b1d67957fb99a45b469ccc2.tar.gz android_art-e0a9a53ec4b4ccbf9b1d67957fb99a45b469ccc2.tar.bz2 android_art-e0a9a53ec4b4ccbf9b1d67957fb99a45b469ccc2.zip | |
Fix StringChange for optimizing compiler.
Uses optimizing compiler more and fixes x86_64 invoke codegen.
Bug: 21902634
Change-Id: Ia2a87d013c4746b107014a04a22a0a37269cfdb2
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 9468f36242..4e747df43f 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -657,7 +657,7 @@ bool HGraphBuilder::BuildInvoke(const Instruction& instruction, (target_method.dex_method_index == dex_compilation_unit_->GetDexMethodIndex()); DCHECK(!is_recursive || (target_method.dex_file == dex_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( |