commit 86891cd7a622bf649fd4c113398afafcbdd6b85e
author Hiroshi Yamauchi <yamauchi@google.com> Mon Oct 06 14:24:36 2014 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Mon Oct 06 14:24:36 2014 -0700
tree 9e23561cd9d1fbe5801ae1e2274d425a23018fb5
parent 31fa08d8db5abae646b15b0c339366232ca25a91

Fix a merge error in cl 108991.

Bug: 12687968
Change-Id: I37603c154b252321b59a5ea02c6a92f5a9300667

runtime/indirect_reference_table-inl.h

diff --git a/runtime/indirect_reference_table-inl.h b/runtime/indirect_reference_table-inl.h
index 7e770f6..e571a0e 100644
--- a/runtime/indirect_reference_table-inl.h
+++ b/runtime/indirect_reference_table-inl.h
@@ -77,7 +77,7 @@
     return nullptr;
   }
   uint32_t idx = ExtractIndex(iref);
-  mirror::Object* obj = table_[idx].GetReference()->Read<kWithoutReadBarrier>();
+  mirror::Object* obj = table_[idx].GetReference()->Read<kReadBarrierOption>();
   VerifyObject(obj);
   return obj;
 }