From 6e83c172f385cb45dd13bbcf41d2df8e410828c6 Mon Sep 17 00:00:00 2001 From: Hiroshi Yamauchi Date: Thu, 1 May 2014 21:25:41 -0700 Subject: Replace the bool kDoReadBarrier template parameter with an enum. Fix one kDoReadBarrier/kIsVolatile mixup in an Object::GetFieldObject call. Bug: 12687968 Change-Id: I896b1137b21a20c0504abd2bf3fe6f83805f3300 --- runtime/read_barrier-inl.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'runtime/read_barrier-inl.h') diff --git a/runtime/read_barrier-inl.h b/runtime/read_barrier-inl.h index ea2f8307b8..88e2f8fa61 100644 --- a/runtime/read_barrier-inl.h +++ b/runtime/read_barrier-inl.h @@ -23,17 +23,18 @@ namespace art { -template +template inline MirrorType* ReadBarrier::Barrier( mirror::Object* obj, MemberOffset offset, mirror::HeapReference* ref_addr) { // Unused for now. UNUSED(obj); UNUSED(offset); UNUSED(ref_addr); - if (kDoReadBarrier && kUseBakerReadBarrier) { + const bool with_read_barrier = kReadBarrierOption == kWithReadBarrier; + if (with_read_barrier && kUseBakerReadBarrier) { // To be implemented. return ref_addr->AsMirrorPtr(); - } else if (kDoReadBarrier && kUseBrooksReadBarrier) { + } else if (with_read_barrier && kUseBrooksReadBarrier) { // To be implemented. return ref_addr->AsMirrorPtr(); } else { -- cgit v1.2.3