summaryrefslogtreecommitdiffstats
path: root/runtime/indirect_reference_table-inl.h
diff options
context:
space:
mode:
authorHiroshi Yamauchi <yamauchi@google.com>2014-06-13 16:44:55 -0700
committerHiroshi Yamauchi <yamauchi@google.com>2014-06-13 16:44:55 -0700
commita91a4bc1f8960f64c5f7e4616d46e21b8e1bfba2 (patch)
tree31988cb0623dc3b095142b65dff37dd959ff4df2 /runtime/indirect_reference_table-inl.h
parent97ed29f800c56a06fd6989e0883e4c97bedd2453 (diff)
downloadart-a91a4bc1f8960f64c5f7e4616d46e21b8e1bfba2.tar.gz
art-a91a4bc1f8960f64c5f7e4616d46e21b8e1bfba2.tar.bz2
art-a91a4bc1f8960f64c5f7e4616d46e21b8e1bfba2.zip
Add read barriers for the class and the intern tables.
Add read barriers for the strong roots in the intern table and the (strong) roots in the class table to make possible concurrent scanning of them. Bug: 12687968 Change-Id: If6edc33a37e65a8494e66dc3b144138b1530367f
Diffstat (limited to 'runtime/indirect_reference_table-inl.h')
-rw-r--r--runtime/indirect_reference_table-inl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/indirect_reference_table-inl.h b/runtime/indirect_reference_table-inl.h
index 790f4d0c17..b787233b37 100644
--- a/runtime/indirect_reference_table-inl.h
+++ b/runtime/indirect_reference_table-inl.h
@@ -80,7 +80,7 @@ inline mirror::Object* IndirectReferenceTable::Get(IndirectRef iref) const {
mirror::Object* obj = *root;
if (LIKELY(obj != kClearedJniWeakGlobal)) {
// The read barrier or VerifyObject won't handle kClearedJniWeakGlobal.
- obj = ReadBarrier::BarrierForWeakRoot<mirror::Object, kReadBarrierOption>(root);
+ obj = ReadBarrier::BarrierForRoot<mirror::Object, kReadBarrierOption>(root);
VerifyObject(obj);
}
return obj;