diff options
| author | 2017-01-19 02:11:15 +0000 | |
|---|---|---|
| committer | 2017-01-19 02:11:15 +0000 | |
| commit | fee255039e30c1c3dfc70c426c3d176221c3cdf9 (patch) | |
| tree | 8207b72cc76513fed9f7b3c01aaa32cd54a87f1c /runtime/entrypoints/entrypoint_utils.h | |
| parent | cc99df230feb46ba717252f002d0cc2da6828421 (diff) | |
Revert "Load the array class in the compiler for allocations."
libcore test fails.
This reverts commit cc99df230feb46ba717252f002d0cc2da6828421.
Change-Id: I5bac595acd2b240886062e8c1f11f9095ff6a9ed
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.h')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.h b/runtime/entrypoints/entrypoint_utils.h index 6a04f20f3a..b427c0717f 100644 --- a/runtime/entrypoints/entrypoint_utils.h +++ b/runtime/entrypoints/entrypoint_utils.h @@ -93,9 +93,10 @@ ALWAYS_INLINE inline mirror::Array* AllocArrayFromCode(dex::TypeIndex type_idx, REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_); -template <bool kInstrumented> +template <bool kAccessCheck, bool kInstrumented> ALWAYS_INLINE inline mirror::Array* AllocArrayFromCodeResolved(mirror::Class* klass, int32_t component_count, + ArtMethod* method, Thread* self, gc::AllocatorType allocator_type) REQUIRES_SHARED(Locks::mutator_lock_) |