commit eebc3af4453f5c1fb5fd80c710cfd49566080d28
author Mathieu Chartier <mathieuc@google.com> Mon Feb 29 18:13:38 2016 -0800
committer Mathieu Chartier <mathieuc@google.com> Tue Mar 01 17:25:02 2016 -0800
tree b4b679247bbee26fef7a818514a09849670090af
parent 73e31f8ae826be5b9b0c3c216abb904cbfa71077

Fix allocation tracking race

Check if changed from uninstrumented to instrumented during GC for
alloc. If we changed, retry the allocation with kInstrumented = true.

Added stress test.

Bug: 27337759

Change-Id: Iaad7977693c9ed927f779a66b29cd58341a837da

runtime/gc/heap.h

diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h
index 6edb548..46dce04 100644
--- a/runtime/gc/heap.h
+++ b/runtime/gc/heap.h
@@ -865,6 +865,7 @@
   // an initial allocation attempt failed.
   mirror::Object* AllocateInternalWithGc(Thread* self,
                                          AllocatorType allocator,
+                                         bool instrumented,
                                          size_t num_bytes,
                                          size_t* bytes_allocated,
                                          size_t* usable_size,