commit 624468cd401cc1ac0dd70c746301e0788a597759
author Hiroshi Yamauchi <yamauchi@google.com> Mon Mar 31 15:14:47 2014 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Mon Mar 31 17:40:21 2014 -0700
tree b21c389d43e25c3d95208c9d2f3f1bc81355a4e5
parent cfd5acf281b0c509f86b13d73c6a8dfa3ea9922c

Make the support code for read barriers a bit more general.

Add an option for Baker in addition to Brooks.

Bug: 12687968
Change-Id: I8a31db817ff6686c72951b6534f588228e270b11

runtime/gc/heap-inl.h

diff --git a/runtime/gc/heap-inl.h b/runtime/gc/heap-inl.h
index 8bfe793..25f20d6 100644
--- a/runtime/gc/heap-inl.h
+++ b/runtime/gc/heap-inl.h
@@ -73,9 +73,11 @@
   DCHECK_GT(bytes_allocated, 0u);
   DCHECK_GT(usable_size, 0u);
   obj->SetClass(klass);
-  if (kUseBrooksPointer) {
-    obj->SetBrooksPointer(obj);
-    obj->AssertSelfBrooksPointer();
+  if (kUseBakerOrBrooksReadBarrier) {
+    if (kUseBrooksReadBarrier) {
+      obj->SetReadBarrierPointer(obj);
+    }
+    obj->AssertReadBarrierPointer();
   }
   if (collector::SemiSpace::kUseRememberedSet && UNLIKELY(allocator == kAllocatorTypeNonMoving)) {
     // (Note this if statement will be constant folded away for the