diff options
| author | Vladimir Marko <vmarko@google.com> | 2019-05-16 16:47:08 +0100 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2019-05-17 08:10:30 +0000 |
| commit | 9b81ac36e161fd993eab17b43b93a96e8c63b5cc (patch) | |
| tree | bac59dd8a62ae9f410c707a4086c330b8923a55b /runtime/interpreter/interpreter_switch_impl-inl.h | |
| parent | 92ed90ca3897ae7861b22aa12740065152839649 (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/interpreter/interpreter_switch_impl-inl.h')
| -rw-r--r-- | runtime/interpreter/interpreter_switch_impl-inl.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/runtime/interpreter/interpreter_switch_impl-inl.h b/runtime/interpreter/interpreter_switch_impl-inl.h index 247fbb7f2f..1a88f1b47d 100644 --- a/runtime/interpreter/interpreter_switch_impl-inl.h +++ b/runtime/interpreter/interpreter_switch_impl-inl.h @@ -797,14 +797,11 @@ class InstructionHandler { false, do_access_check); if (LIKELY(c != nullptr)) { + gc::AllocatorType allocator_type = Runtime::Current()->GetHeap()->GetCurrentAllocator(); if (UNLIKELY(c->IsStringClass())) { - gc::AllocatorType allocator_type = Runtime::Current()->GetHeap()->GetCurrentAllocator(); - obj = mirror::String::AllocEmptyString<true>(self, allocator_type); + obj = mirror::String::AllocEmptyString(self, allocator_type); } else { - obj = AllocObjectFromCode<true>( - c.Ptr(), - self, - Runtime::Current()->GetHeap()->GetCurrentAllocator()); + obj = AllocObjectFromCode(c, self, allocator_type); } } if (UNLIKELY(obj == nullptr)) { @@ -825,7 +822,7 @@ class InstructionHandler { ALWAYS_INLINE void NEW_ARRAY() REQUIRES_SHARED(Locks::mutator_lock_) { int32_t length = shadow_frame.GetVReg(inst->VRegB_22c(inst_data)); - ObjPtr<mirror::Object> obj = AllocArrayFromCode<do_access_check, true>( + ObjPtr<mirror::Object> obj = AllocArrayFromCode<do_access_check>( dex::TypeIndex(inst->VRegC_22c()), length, shadow_frame.GetMethod(), |