diff options
| author | 2015-01-05 19:26:08 +0000 | |
|---|---|---|
| committer | 2015-01-05 19:26:09 +0000 | |
| commit | 3d5872eb090a04a9444b5621d381eec3846f47a3 (patch) | |
| tree | 121bc995f1bb702cf1a01e7279dfeb46fda054ba /runtime/entrypoints/entrypoint_utils.cc | |
| parent | b994c437ae8ec6b9d85ceb1fb11e4c97eace32ef (diff) | |
| parent | 1cc7dbabd03e0a6c09d68161417a21bd6f9df371 (diff) | |
Merge "ART: Reorder entrypoint argument order"
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.cc')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index c329fe6920..e734d4512d 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -33,8 +33,8 @@ namespace art { static inline mirror::Class* CheckFilledNewArrayAlloc(uint32_t type_idx, - mirror::ArtMethod* referrer, int32_t component_count, + mirror::ArtMethod* referrer, Thread* self, bool access_check) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { @@ -76,11 +76,11 @@ static inline mirror::Class* CheckFilledNewArrayAlloc(uint32_t type_idx, } // Helper function to allocate array for FILLED_NEW_ARRAY. -mirror::Array* CheckAndAllocArrayFromCode(uint32_t type_idx, mirror::ArtMethod* referrer, - int32_t component_count, Thread* self, +mirror::Array* CheckAndAllocArrayFromCode(uint32_t type_idx, int32_t component_count, + mirror::ArtMethod* referrer, Thread* self, bool access_check, gc::AllocatorType /* allocator_type */) { - mirror::Class* klass = CheckFilledNewArrayAlloc(type_idx, referrer, component_count, self, + mirror::Class* klass = CheckFilledNewArrayAlloc(type_idx, component_count, referrer, self, access_check); if (UNLIKELY(klass == nullptr)) { return nullptr; @@ -96,12 +96,12 @@ mirror::Array* CheckAndAllocArrayFromCode(uint32_t type_idx, mirror::ArtMethod* // Helper function to allocate array for FILLED_NEW_ARRAY. mirror::Array* CheckAndAllocArrayFromCodeInstrumented(uint32_t type_idx, - mirror::ArtMethod* referrer, int32_t component_count, + mirror::ArtMethod* referrer, Thread* self, bool access_check, gc::AllocatorType /* allocator_type */) { - mirror::Class* klass = CheckFilledNewArrayAlloc(type_idx, referrer, component_count, self, + mirror::Class* klass = CheckFilledNewArrayAlloc(type_idx, component_count, referrer, self, access_check); if (UNLIKELY(klass == nullptr)) { return nullptr; |