diff options
Diffstat (limited to 'runtime/mirror/array.cc')
| -rw-r--r-- | runtime/mirror/array.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/runtime/mirror/array.cc b/runtime/mirror/array.cc index d42f5a0099..9bff169191 100644 --- a/runtime/mirror/array.cc +++ b/runtime/mirror/array.cc @@ -54,8 +54,8 @@ static ObjPtr<Array> RecursiveCreateMultiArray(Thread* self, Handle<mirror::Class> h_component_type(hs.NewHandle(array_class->GetComponentType())); size_t component_size_shift = h_component_type->GetPrimitiveTypeSizeShift(); gc::AllocatorType allocator_type = Runtime::Current()->GetHeap()->GetCurrentAllocator(); - Handle<Array> new_array(hs.NewHandle(Array::Alloc<true>( - self, array_class.Get(), array_length, component_size_shift, allocator_type))); + Handle<Array> new_array(hs.NewHandle( + Array::Alloc(self, array_class.Get(), array_length, component_size_shift, allocator_type))); if (UNLIKELY(new_array == nullptr)) { CHECK(self->IsExceptionPending()); return nullptr; @@ -122,11 +122,11 @@ ObjPtr<Array> Array::CreateMultiArray(Thread* self, template<typename T> ObjPtr<PrimitiveArray<T>> PrimitiveArray<T>::Alloc(Thread* self, size_t length) { gc::AllocatorType allocator_type = Runtime::Current()->GetHeap()->GetCurrentAllocator(); - ObjPtr<Array> raw_array = Array::Alloc<true>(self, - GetClassRoot<PrimitiveArray<T>>(), - length, - ComponentSizeShiftWidth(sizeof(T)), - allocator_type); + ObjPtr<Array> raw_array = Array::Alloc(self, + GetClassRoot<PrimitiveArray<T>>(), + length, + ComponentSizeShiftWidth(sizeof(T)), + allocator_type); return ObjPtr<PrimitiveArray<T>>::DownCast(raw_array); } @@ -151,7 +151,7 @@ ObjPtr<Array> Array::CopyOf(Thread* self, int32_t new_length) { const auto component_size = klass->GetComponentSize(); const auto component_shift = klass->GetComponentSizeShift(); ObjPtr<Array> new_array = - Alloc<true>(self, klass, new_length, component_shift, allocator_type); // Invalidates klass. + Alloc(self, klass, new_length, component_shift, allocator_type); // Invalidates klass. if (LIKELY(new_array != nullptr)) { memcpy(new_array->GetRawData(component_size, 0), h_this->GetRawData(component_size, 0), |