summaryrefslogtreecommitdiff
path: root/runtime/entrypoints/entrypoint_utils-inl.h
diff options
context:
space:
mode:
authorVladimir Marko <vmarko@google.com>2019-05-16 16:47:08 +0100
committerVladimir Marko <vmarko@google.com>2019-05-17 08:10:30 +0000
commit9b81ac36e161fd993eab17b43b93a96e8c63b5cc (patch)
treebac59dd8a62ae9f410c707a4086c330b8923a55b /runtime/entrypoints/entrypoint_utils-inl.h
parent92ed90ca3897ae7861b22aa12740065152839649 (diff)
Add default argument kIsInstrumented=true.
kIsInstrumented=false is reserved for use by specialized entrypoints which are used only when we can ensure that the code is not instrumented. So add the default argument to simplify all other callers. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Change-Id: I3419795794fec9a1733ab3ad698b6415dbac679d
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils-inl.h')
-rw-r--r--runtime/entrypoints/entrypoint_utils-inl.h21
1 files changed, 14 insertions, 7 deletions
diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h
index 53dea7204c..4d24a8ce87 100644
--- a/runtime/entrypoints/entrypoint_utils-inl.h
+++ b/runtime/entrypoints/entrypoint_utils-inl.h
@@ -219,10 +219,11 @@ inline ObjPtr<mirror::Object> AllocObjectFromCodeResolved(ObjPtr<mirror::Class>
// Pass in false since the object cannot be finalizable.
// CheckClassInitializedForObjectAlloc can cause thread suspension which means we may now be
// instrumented.
- return klass->Alloc</*kInstrumented=*/true, false>(self, heap->GetCurrentAllocator());
+ return klass->Alloc</*kInstrumented=*/true, /*kCheckAddFinalizer=*/false>(
+ self, heap->GetCurrentAllocator());
}
// Pass in false since the object cannot be finalizable.
- return klass->Alloc<kInstrumented, false>(self, allocator_type);
+ return klass->Alloc<kInstrumented, /*kCheckAddFinalizer=*/false>(self, allocator_type);
}
// Given the context of a calling Method and an initialized class, create an instance.
@@ -233,7 +234,7 @@ inline ObjPtr<mirror::Object> AllocObjectFromCodeInitialized(ObjPtr<mirror::Clas
gc::AllocatorType allocator_type) {
DCHECK(klass != nullptr);
// Pass in false since the object cannot be finalizable.
- return klass->Alloc<kInstrumented, false>(self, allocator_type);
+ return klass->Alloc<kInstrumented, /*kCheckAddFinalizer=*/false>(self, allocator_type);
}
@@ -296,8 +297,11 @@ inline ObjPtr<mirror::Array> AllocArrayFromCode(dex::TypeIndex type_idx,
klass->GetComponentSizeShift(),
heap->GetCurrentAllocator());
}
- return mirror::Array::Alloc<kInstrumented>(self, klass, component_count,
- klass->GetComponentSizeShift(), allocator_type);
+ return mirror::Array::Alloc<kInstrumented>(self,
+ klass,
+ component_count,
+ klass->GetComponentSizeShift(),
+ allocator_type);
}
template <bool kInstrumented>
@@ -313,8 +317,11 @@ inline ObjPtr<mirror::Array> AllocArrayFromCodeResolved(ObjPtr<mirror::Class> kl
}
// No need to retry a slow-path allocation as the above code won't cause a GC or thread
// suspension.
- return mirror::Array::Alloc<kInstrumented>(self, klass, component_count,
- klass->GetComponentSizeShift(), allocator_type);
+ return mirror::Array::Alloc<kInstrumented>(self,
+ klass,
+ component_count,
+ klass->GetComponentSizeShift(),
+ allocator_type);
}
template<FindFieldType type, bool access_check>