diff options
| author | Vladimir Marko <vmarko@google.com> | 2016-08-25 19:52:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-08-25 19:52:02 +0000 |
| commit | 521691ae4dfad47cf6b46858347fa5fa32fd7bcc (patch) | |
| tree | bb9fdefaad92ac05e20c50e1a56a35454dad6576 /compiler/optimizing/code_generator_x86.cc | |
| parent | cb83389879f0c391996aad0f7435caffa4d6b30f (diff) | |
| parent | 8d49fd7b1087fba274a844cbf180349c528cf912 (diff) | |
Merge "ArraySet without type check does not need read barrier."
Diffstat (limited to 'compiler/optimizing/code_generator_x86.cc')
| -rw-r--r-- | compiler/optimizing/code_generator_x86.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc index f50eb5cb7e..f6e8ee1d48 100644 --- a/compiler/optimizing/code_generator_x86.cc +++ b/compiler/optimizing/code_generator_x86.cc @@ -5253,12 +5253,10 @@ void LocationsBuilderX86::VisitArraySet(HArraySet* instruction) { bool needs_write_barrier = CodeGenerator::StoreNeedsWriteBarrier(value_type, instruction->GetValue()); bool may_need_runtime_call_for_type_check = instruction->NeedsTypeCheck(); - bool object_array_set_with_read_barrier = - kEmitCompilerReadBarrier && (value_type == Primitive::kPrimNot); LocationSummary* locations = new (GetGraph()->GetArena()) LocationSummary( instruction, - (may_need_runtime_call_for_type_check || object_array_set_with_read_barrier) ? + may_need_runtime_call_for_type_check ? LocationSummary::kCallOnSlowPath : LocationSummary::kNoCall); |