commit fd846c5c2e9bc63b250c2bce271c2d6b8905f79d
author Vladimir Marko <vmarko@google.com> Tue Oct 19 07:54:13 2021 +0100
committer Vladimir Marko <vmarko@google.com> Mon Oct 25 16:30:24 2021 +0000
tree a0bd1a1c2fcdc58a4acc0531b0d6e79ce5d65313
parent 0a746a7a7e2a57679adf2830a9c62f569bff9513

Remove all support for Brooks read barrier.

Test: m
Bug: 177048505
Change-Id: Ifb16927455b98996c61f0b6370bae9a114bf8018

runtime/gc/reference_queue.cc

diff --git a/runtime/gc/reference_queue.cc b/runtime/gc/reference_queue.cc
index 1e3cf93..568ca04 100644
--- a/runtime/gc/reference_queue.cc
+++ b/runtime/gc/reference_queue.cc
@@ -75,7 +75,7 @@
 // This must be called whenever DequeuePendingReference is called.
 void ReferenceQueue::DisableReadBarrierForReference(ObjPtr<mirror::Reference> ref) {
   Heap* heap = Runtime::Current()->GetHeap();
-  if (kUseBakerOrBrooksReadBarrier && heap->CurrentCollectorType() == kCollectorTypeCC &&
+  if (kUseBakerReadBarrier && heap->CurrentCollectorType() == kCollectorTypeCC &&
       heap->ConcurrentCopyingCollector()->IsActive()) {
     // Change the gray ptr we left in ConcurrentCopying::ProcessMarkStackRef() to non-gray.
     // We check IsActive() above because we don't want to do this when the zygote compaction