summaryrefslogtreecommitdiffstats
path: root/runtime/read_barrier-inl.h
diff options
context:
space:
mode:
authorHiroshi Yamauchi <yamauchi@google.com>2014-05-23 19:58:15 -0700
committerHiroshi Yamauchi <yamauchi@google.com>2014-05-28 11:46:57 -0700
commit1bd4872773184fb9f5f152c7bbf9856a8235d2af (patch)
treef00044ea6edf93e130dd89a30f88fb6c7c60b0ce /runtime/read_barrier-inl.h
parent0130ba045e1397594f2c6a0dd48730349fe3cbed (diff)
downloadart-1bd4872773184fb9f5f152c7bbf9856a8235d2af.tar.gz
art-1bd4872773184fb9f5f152c7bbf9856a8235d2af.tar.bz2
art-1bd4872773184fb9f5f152c7bbf9856a8235d2af.zip
Add read barriers to the weak roots in the intern table.
Bug: 12687968 Change-Id: I424f1df76a7e3d7154fb9f3c951c973d19bd640f
Diffstat (limited to 'runtime/read_barrier-inl.h')
-rw-r--r--runtime/read_barrier-inl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/read_barrier-inl.h b/runtime/read_barrier-inl.h
index 4302c9ef85..e252b7bb83 100644
--- a/runtime/read_barrier-inl.h
+++ b/runtime/read_barrier-inl.h
@@ -44,8 +44,8 @@ inline MirrorType* ReadBarrier::Barrier(
}
template <typename MirrorType, ReadBarrierOption kReadBarrierOption>
-inline MirrorType* ReadBarrier::BarrierForWeakRoot(MirrorType* ref) {
- UNUSED(ref);
+inline MirrorType* ReadBarrier::BarrierForWeakRoot(MirrorType** weak_root) {
+ MirrorType* ref = *weak_root;
const bool with_read_barrier = kReadBarrierOption == kWithReadBarrier;
if (with_read_barrier && kUseBakerReadBarrier) {
// To be implemented.