diff options
Diffstat (limited to 'runtime/mirror/object_array-inl.h')
| -rw-r--r-- | runtime/mirror/object_array-inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mirror/object_array-inl.h b/runtime/mirror/object_array-inl.h index fbc4f4a675..96d426b59e 100644 --- a/runtime/mirror/object_array-inl.h +++ b/runtime/mirror/object_array-inl.h @@ -131,7 +131,7 @@ inline void ObjectArray<T>::AssignableMemmove(int32_t dst_pos, ObjectArray<T>* s CHECK_EQ(sizeof(HeapReference<T>), sizeof(uint32_t)); IntArray* dstAsIntArray = reinterpret_cast<IntArray*>(this); IntArray* srcAsIntArray = reinterpret_cast<IntArray*>(src); - if (kUseBakerOrBrooksReadBarrier) { + if (kUseReadBarrier) { // TODO: Optimize this later? const bool copy_forward = (src != this) || (dst_pos < src_pos) || (dst_pos - src_pos >= count); if (copy_forward) { @@ -174,7 +174,7 @@ inline void ObjectArray<T>::AssignableMemcpy(int32_t dst_pos, ObjectArray<T>* sr CHECK_EQ(sizeof(HeapReference<T>), sizeof(uint32_t)); IntArray* dstAsIntArray = reinterpret_cast<IntArray*>(this); IntArray* srcAsIntArray = reinterpret_cast<IntArray*>(src); - if (kUseBakerOrBrooksReadBarrier) { + if (kUseReadBarrier) { // TODO: Optimize this later? for (int i = 0; i < count; ++i) { // We need a RB here. ObjectArray::GetWithoutChecks() contains a RB. |