commit 001e5b33ba7065dde0b85450830b605733ae1685
author Alex Light <allight@google.com> Tue Dec 17 15:30:33 2019 -0800
committer Alex Light <allight@google.com> Tue Dec 17 16:36:42 2019 -0800
tree 0123782401f1bceedf7227d16fa6ce6d20a97f64
parent 5c0177215ee88a9372b883d06661e25a8f6105de

Remove illegal PreObjectAlloc call

We were incorrectly calling PreObjectAlloc with
Roles::uninterruptible_. Due to its location this generally won't
cause any issues but the call is not allowed nor needed.

Test: ./test.py --host
Bug: 146436130
Change-Id: I9672e679f4683eb3151d149aa918ce7fcb482b69

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index eea3084..de15927 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -1733,14 +1733,15 @@
   StackHandleScope<1> hs(self);
   HandleWrapperObjPtr<mirror::Class> h_klass(hs.NewHandleWrapper(klass));
 
-  auto send_object_pre_alloc = [&]() REQUIRES_SHARED(Locks::mutator_lock_) {
-    if (UNLIKELY(instrumented)) {
-      AllocationListener* l = alloc_listener_.load(std::memory_order_seq_cst);
-      if (UNLIKELY(l != nullptr) && UNLIKELY(l->HasPreAlloc())) {
-        l->PreObjectAllocated(self, h_klass, &alloc_size);
-      }
-    }
-  };
+  auto send_object_pre_alloc =
+      [&]() REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_) {
+        if (UNLIKELY(instrumented)) {
+          AllocationListener* l = alloc_listener_.load(std::memory_order_seq_cst);
+          if (UNLIKELY(l != nullptr) && UNLIKELY(l->HasPreAlloc())) {
+            l->PreObjectAllocated(self, h_klass, &alloc_size);
+          }
+        }
+      };
 #define PERFORM_SUSPENDING_OPERATION(op)                                          \
   [&]() REQUIRES(Roles::uninterruptible_) REQUIRES_SHARED(Locks::mutator_lock_) { \
     ScopedAllowThreadSuspension ats;                                              \
@@ -1755,8 +1756,6 @@
       PERFORM_SUSPENDING_OPERATION(WaitForGcToComplete(kGcCauseForAlloc, self));
   // If we were the default allocator but the allocator changed while we were suspended,
   // abort the allocation.
-  // We just waited, call the pre-alloc again.
-  send_object_pre_alloc();
   if ((was_default_allocator && allocator != GetCurrentAllocator()) ||
       (!instrumented && EntrypointsInstrumented())) {
     return nullptr;