From 98ea9d9d82ab078ca10fa7f8e02eddda94cf1d98 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 19 Oct 2018 14:06:15 -0700 Subject: ART: Refactor for bugprone-argument-comment Handles runtime. Bug: 116054210 Test: WITH_TIDY=1 mmma art Change-Id: Ibc0d5086809d647f0ce4df5452eb84442d27ecf0 --- runtime/entrypoints/entrypoint_utils-inl.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'runtime/entrypoints/entrypoint_utils-inl.h') diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h index 35bfa91aed..120a0e9ea9 100644 --- a/runtime/entrypoints/entrypoint_utils-inl.h +++ b/runtime/entrypoints/entrypoint_utils-inl.h @@ -191,7 +191,7 @@ inline mirror::Object* AllocObjectFromCode(mirror::Class* klass, return nullptr; } // CheckObjectAlloc can cause thread suspension which means we may now be instrumented. - return klass->Alloc( + return klass->Alloc( self, Runtime::Current()->GetHeap()->GetCurrentAllocator()).Ptr(); } @@ -216,7 +216,7 @@ inline mirror::Object* AllocObjectFromCodeResolved(mirror::Class* klass, // Pass in false since the object cannot be finalizable. // CheckClassInitializedForObjectAlloc can cause thread suspension which means we may now be // instrumented. - return klass->Alloc(self, heap->GetCurrentAllocator()).Ptr(); + return klass->Alloc(self, heap->GetCurrentAllocator()).Ptr(); } // Pass in false since the object cannot be finalizable. return klass->Alloc(self, allocator_type).Ptr(); @@ -287,11 +287,11 @@ inline ObjPtr AllocArrayFromCode(dex::TypeIndex type_idx, } gc::Heap* heap = Runtime::Current()->GetHeap(); // CheckArrayAlloc can cause thread suspension which means we may now be instrumented. - return mirror::Array::Alloc(self, - klass, - component_count, - klass->GetComponentSizeShift(), - heap->GetCurrentAllocator()); + return mirror::Array::Alloc(self, + klass, + component_count, + klass->GetComponentSizeShift(), + heap->GetCurrentAllocator()); } return mirror::Array::Alloc(self, klass, component_count, klass->GetComponentSizeShift(), allocator_type); -- cgit v1.2.3-59-g8ed1b