diff options
| author | 2024-08-19 21:32:19 +0000 | |
|---|---|---|
| committer | 2024-08-19 23:48:03 +0000 | |
| commit | 7c89f49c2c542df1a5780fb851e2ef0e0909f48f (patch) | |
| tree | 02bc90403e3f56bbb59c7fb1d89b785cd8257b28 /runtime/mirror/array-alloc-inl.h | |
| parent | 806ace6dfa77cd65b05b20affb6a7e7072dcc845 (diff) | |
Revert "Object.clone() allocates more movable objects"
This reverts commit a5001fed23788c966fd87048d7f17ba8c0b51914.
Reason for revert: b/360363656
Change-Id: Ibfea46976bb6434d728c69160edb5904ab7708aa
Diffstat (limited to 'runtime/mirror/array-alloc-inl.h')
| -rw-r--r-- | runtime/mirror/array-alloc-inl.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/mirror/array-alloc-inl.h b/runtime/mirror/array-alloc-inl.h index 8e182a3158..b905fd1727 100644 --- a/runtime/mirror/array-alloc-inl.h +++ b/runtime/mirror/array-alloc-inl.h @@ -115,7 +115,7 @@ class SetLengthToUsableSizeVisitor { DISALLOW_COPY_AND_ASSIGN(SetLengthToUsableSizeVisitor); }; -template <bool kIsInstrumented, bool kFillUsable, bool kCheckLargeObject> +template <bool kIsInstrumented, bool kFillUsable> inline ObjPtr<Array> Array::Alloc(Thread* self, ObjPtr<Class> array_class, int32_t component_count, @@ -143,15 +143,15 @@ inline ObjPtr<Array> Array::Alloc(Thread* self, ObjPtr<Array> result; if (!kFillUsable) { SetLengthVisitor visitor(component_count); - result = - ObjPtr<Array>::DownCast(heap->AllocObjectWithAllocator<kIsInstrumented, kCheckLargeObject>( + result = ObjPtr<Array>::DownCast( + heap->AllocObjectWithAllocator<kIsInstrumented>( self, array_class, size, allocator_type, visitor)); } else { SetLengthToUsableSizeVisitor visitor(component_count, DataOffset(1U << component_size_shift).SizeValue(), component_size_shift); - result = - ObjPtr<Array>::DownCast(heap->AllocObjectWithAllocator<kIsInstrumented, kCheckLargeObject>( + result = ObjPtr<Array>::DownCast( + heap->AllocObjectWithAllocator<kIsInstrumented>( self, array_class, size, allocator_type, visitor)); } if (kIsDebugBuild && result != nullptr && Runtime::Current()->IsStarted()) { |