diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-05-23 19:58:15 -0700 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2014-05-28 11:46:57 -0700 |
| commit | 1bd4872773184fb9f5f152c7bbf9856a8235d2af (patch) | |
| tree | f00044ea6edf93e130dd89a30f88fb6c7c60b0ce /runtime/monitor.h | |
| parent | 0130ba045e1397594f2c6a0dd48730349fe3cbed (diff) | |
| download | art-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/monitor.h')
| -rw-r--r-- | runtime/monitor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/monitor.h b/runtime/monitor.h index 9e6d255a0e..bd0e23cafe 100644 --- a/runtime/monitor.h +++ b/runtime/monitor.h @@ -94,8 +94,8 @@ class Monitor { static bool IsValidLockWord(LockWord lock_word); template<ReadBarrierOption kReadBarrierOption = kWithReadBarrier> - mirror::Object* GetObject() const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - return ReadBarrier::BarrierForWeakRoot<mirror::Object, kReadBarrierOption>(obj_); + mirror::Object* GetObject() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + return ReadBarrier::BarrierForWeakRoot<mirror::Object, kReadBarrierOption>(&obj_); } void SetObject(mirror::Object* object); |