commit 446f9ee5031cf89b8964e29eba2c9f10a4d4aaf1
author Mathieu Chartier <mathieuc@google.com> Mon Dec 01 15:00:27 2014 -0800
committer Mathieu Chartier <mathieuc@google.com> Mon Dec 01 17:06:33 2014 -0800
tree 224af2e70163cdb99ce61662feba63a9b51a2caf
parent 87e0aa4c72962a54bbf64fc020c1f59d13c3e30f

Try normal allocation if large object allocation fails

If a large object allocation fails, we now try the normal allocators.

Bug: 18124612

(cherry picked from commit f1c4d0e3a27e9b39916750147ecdea1418fcc231)

Change-Id: Ib83ebe53fbdd83aa2d23fd10a8bb10e149f8918f

runtime/gc/heap.h

diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h
index 69a573e..4e1a0ff 100644
--- a/runtime/gc/heap.h
+++ b/runtime/gc/heap.h
@@ -654,7 +654,7 @@
 
   // We don't force this to be inlined since it is a slow path.
   template <bool kInstrumented, typename PreFenceVisitor>
-  mirror::Object* AllocLargeObject(Thread* self, mirror::Class* klass, size_t byte_count,
+  mirror::Object* AllocLargeObject(Thread* self, mirror::Class** klass, size_t byte_count,
                                    const PreFenceVisitor& pre_fence_visitor)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);