diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-10-06 14:24:36 -0700 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2014-10-06 14:24:36 -0700 |
| commit | 86891cd7a622bf649fd4c113398afafcbdd6b85e (patch) | |
| tree | 9e23561cd9d1fbe5801ae1e2274d425a23018fb5 | |
| parent | 31fa08d8db5abae646b15b0c339366232ca25a91 (diff) | |
| download | art-86891cd7a622bf649fd4c113398afafcbdd6b85e.tar.gz art-86891cd7a622bf649fd4c113398afafcbdd6b85e.tar.bz2 art-86891cd7a622bf649fd4c113398afafcbdd6b85e.zip | |
Fix a merge error in cl 108991.
Bug: 12687968
Change-Id: I37603c154b252321b59a5ea02c6a92f5a9300667
| -rw-r--r-- | runtime/indirect_reference_table-inl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/indirect_reference_table-inl.h b/runtime/indirect_reference_table-inl.h index 7e770f64a9..e571a0ebc1 100644 --- a/runtime/indirect_reference_table-inl.h +++ b/runtime/indirect_reference_table-inl.h @@ -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; } |