OSDN Git Service

Fix a merge error in cl 108991.
authorHiroshi Yamauchi <yamauchi@google.com>
Mon, 6 Oct 2014 21:24:36 +0000 (14:24 -0700)
committerHiroshi Yamauchi <yamauchi@google.com>
Mon, 6 Oct 2014 21:24:36 +0000 (14:24 -0700)
Bug: 12687968
Change-Id: I37603c154b252321b59a5ea02c6a92f5a9300667

runtime/indirect_reference_table-inl.h

index 7e770f6..e571a0e 100644 (file)
@@ -77,7 +77,7 @@ inline mirror::Object* IndirectReferenceTable::Get(IndirectRef iref) const {
     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;
 }