diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-05-21 21:10:23 -0700 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2014-05-21 21:19:17 -0700 |
| commit | 4cba0d979a11f955e6ec3c0f1bf61478af7aa810 (patch) | |
| tree | b3e3b61af6bd079989a1bf5259daaa8006af32d4 /runtime/read_barrier.h | |
| parent | 388c6e273018c753d7822d09d7cda0826f0c32ed (diff) | |
| download | art-4cba0d979a11f955e6ec3c0f1bf61478af7aa810.tar.gz art-4cba0d979a11f955e6ec3c0f1bf61478af7aa810.tar.bz2 art-4cba0d979a11f955e6ec3c0f1bf61478af7aa810.zip | |
Add a read barrier for weak roots in monitors.
A weak root requires a read barrier for the to-space invariant to hold
because the object pointed to by a weak root can't be marked/forwarded
like the one pointed to by a strong root (GC does not know if it's
alive or not at that point) and because, without a read barrier, a
mutator could access it and obtain a from-space reference, which would
violate the to-space invariant.
TODO: do similar for the other types of weak roots.
Bug: 12687968
Change-Id: I563a0fa4f875e0c21ac96f57696959454e13b15a
Diffstat (limited to 'runtime/read_barrier.h')
| -rw-r--r-- | runtime/read_barrier.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/read_barrier.h b/runtime/read_barrier.h index 73c3d43e92..e40e8eaa37 100644 --- a/runtime/read_barrier.h +++ b/runtime/read_barrier.h @@ -37,6 +37,10 @@ class ReadBarrier { ALWAYS_INLINE static MirrorType* Barrier( mirror::Object* obj, MemberOffset offset, mirror::HeapReference<MirrorType>* ref_addr) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + + template <typename MirrorType, ReadBarrierOption kReadBarrierOption = kWithReadBarrier> + ALWAYS_INLINE static MirrorType* BarrierForWeakRoot(MirrorType* ref) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); }; } // namespace art |