OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
31fa08d
)
Fix a merge error in cl 108991.
author
Hiroshi Yamauchi
<yamauchi@google.com>
Mon, 6 Oct 2014 21:24:36 +0000
(14:24 -0700)
committer
Hiroshi 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
patch
|
blob
|
history
diff --git
a/runtime/indirect_reference_table-inl.h
b/runtime/indirect_reference_table-inl.h
index
7e770f6
..
e571a0e
100644
(file)
--- 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<k
WithoutReadBarrier
>();
+ mirror::Object* obj = table_[idx].GetReference()->Read<k
ReadBarrierOption
>();
VerifyObject(obj);
return obj;
}