diff options
| author | Andreas Gampe <agampe@google.com> | 2015-01-05 19:26:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-05 19:26:09 +0000 |
| commit | 3d5872eb090a04a9444b5621d381eec3846f47a3 (patch) | |
| tree | 121bc995f1bb702cf1a01e7279dfeb46fda054ba /runtime/entrypoints/entrypoint_utils.h | |
| parent | b994c437ae8ec6b9d85ceb1fb11e4c97eace32ef (diff) | |
| parent | 1cc7dbabd03e0a6c09d68161417a21bd6f9df371 (diff) | |
| download | android_art-3d5872eb090a04a9444b5621d381eec3846f47a3.tar.gz android_art-3d5872eb090a04a9444b5621d381eec3846f47a3.tar.bz2 android_art-3d5872eb090a04a9444b5621d381eec3846f47a3.zip | |
Merge "ART: Reorder entrypoint argument order"
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.h')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.h b/runtime/entrypoints/entrypoint_utils.h index 0531122ed2..77eec46161 100644 --- a/runtime/entrypoints/entrypoint_utils.h +++ b/runtime/entrypoints/entrypoint_utils.h @@ -80,8 +80,8 @@ ALWAYS_INLINE inline mirror::Object* AllocObjectFromCodeInitialized(mirror::Clas template <bool kAccessCheck> ALWAYS_INLINE inline mirror::Class* CheckArrayAlloc(uint32_t type_idx, - mirror::ArtMethod* method, int32_t component_count, + mirror::ArtMethod* method, bool* slow_path) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); @@ -91,29 +91,30 @@ ALWAYS_INLINE inline mirror::Class* CheckArrayAlloc(uint32_t type_idx, // check. template <bool kAccessCheck, bool kInstrumented> ALWAYS_INLINE inline mirror::Array* AllocArrayFromCode(uint32_t type_idx, - mirror::ArtMethod* method, int32_t component_count, + mirror::ArtMethod* method, Thread* self, gc::AllocatorType allocator_type) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); template <bool kAccessCheck, bool kInstrumented> ALWAYS_INLINE inline mirror::Array* AllocArrayFromCodeResolved(mirror::Class* klass, - mirror::ArtMethod* method, int32_t component_count, + mirror::ArtMethod* method, Thread* self, gc::AllocatorType allocator_type) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); -extern mirror::Array* CheckAndAllocArrayFromCode(uint32_t type_idx, mirror::ArtMethod* method, - int32_t component_count, Thread* self, +extern mirror::Array* CheckAndAllocArrayFromCode(uint32_t type_idx, int32_t component_count, + mirror::ArtMethod* method, Thread* self, bool access_check, gc::AllocatorType allocator_type) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); extern mirror::Array* CheckAndAllocArrayFromCodeInstrumented(uint32_t type_idx, + int32_t component_count, mirror::ArtMethod* method, - int32_t component_count, Thread* self, + Thread* self, bool access_check, gc::AllocatorType allocator_type) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); |