diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2013-11-21 12:42:36 -0800 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2013-11-21 12:42:36 -0800 |
| commit | cbbb080e8b45e46ea43af521ba2a0b3d432702a7 (patch) | |
| tree | 3743409700a99c7f8d91059a24962e28d04a8be9 /runtime/entrypoints/portable | |
| parent | 1febddf359ae500ef1bb01ab4883b076fcb56440 (diff) | |
| download | art-cbbb080e8b45e46ea43af521ba2a0b3d432702a7.zip art-cbbb080e8b45e46ea43af521ba2a0b3d432702a7.tar.gz art-cbbb080e8b45e46ea43af521ba2a0b3d432702a7.tar.bz2 | |
Fix a libartd.so boot crash in Heap::AllocObjectWithAllocator()
Bug: 11806947
Change-Id: I826875f23ee2233d4128e852ff6fe7e26ced378f
Diffstat (limited to 'runtime/entrypoints/portable')
| -rw-r--r-- | runtime/entrypoints/portable/portable_alloc_entrypoints.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/entrypoints/portable/portable_alloc_entrypoints.cc b/runtime/entrypoints/portable/portable_alloc_entrypoints.cc index 6d23efe..0d57516 100644 --- a/runtime/entrypoints/portable/portable_alloc_entrypoints.cc +++ b/runtime/entrypoints/portable/portable_alloc_entrypoints.cc @@ -57,8 +57,8 @@ extern "C" mirror::Object* art_portable_check_and_alloc_array_from_code(uint32_t uint32_t length, Thread* thread) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - return CheckAndAllocArrayFromCode(type_idx, referrer, length, thread, false, - gc::kAllocatorTypeFreeList); + return CheckAndAllocArrayFromCodeInstrumented(type_idx, referrer, length, thread, false, + gc::kAllocatorTypeFreeList); } extern "C" mirror::Object* art_portable_check_and_alloc_array_from_code_with_access_check(uint32_t type_idx, @@ -66,8 +66,8 @@ extern "C" mirror::Object* art_portable_check_and_alloc_array_from_code_with_acc uint32_t length, Thread* thread) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - return CheckAndAllocArrayFromCode(type_idx, referrer, length, thread, true, - gc::kAllocatorTypeFreeList); + return CheckAndAllocArrayFromCodeInstrumented(type_idx, referrer, length, thread, true, + gc::kAllocatorTypeFreeList); } } // namespace art |