diff options
| author | 2016-10-05 21:55:20 +0000 | |
|---|---|---|
| committer | 2016-10-05 21:55:21 +0000 | |
| commit | 463a67dd60ab0341e56713426a34c3c0a0749a35 (patch) | |
| tree | a6644661cffbd5ea89b7215eb37ef261ee9dcff8 /runtime/java_vm_ext.cc | |
| parent | 78c6fefdb9008cb6dc9f0014d4616b457009c6c8 (diff) | |
| parent | 8778c521de4f686118549ef7b20ae497e53b9e93 (diff) | |
Merge "Change indirect reference table to use ObjPtr"
Diffstat (limited to 'runtime/java_vm_ext.cc')
| -rw-r--r-- | runtime/java_vm_ext.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc index 215f2b3ddf..ecd6b524df 100644 --- a/runtime/java_vm_ext.cc +++ b/runtime/java_vm_ext.cc @@ -641,7 +641,7 @@ void JavaVMExt::BroadcastForNewWeakGlobals() { } mirror::Object* JavaVMExt::DecodeGlobal(IndirectRef ref) { - return globals_.SynchronizedGet(ref); + return globals_.SynchronizedGet(ref).Ptr(); } void JavaVMExt::UpdateGlobal(Thread* self, IndirectRef ref, mirror::Object* result) { @@ -669,7 +669,7 @@ mirror::Object* JavaVMExt::DecodeWeakGlobal(Thread* self, IndirectRef ref) { // if MayAccessWeakGlobals is false. DCHECK_EQ(GetIndirectRefKind(ref), kWeakGlobal); if (LIKELY(MayAccessWeakGlobalsUnlocked(self))) { - return weak_globals_.SynchronizedGet(ref); + return weak_globals_.SynchronizedGet(ref).Ptr(); } MutexLock mu(self, weak_globals_lock_); return DecodeWeakGlobalLocked(self, ref); @@ -682,7 +682,7 @@ mirror::Object* JavaVMExt::DecodeWeakGlobalLocked(Thread* self, IndirectRef ref) while (UNLIKELY(!MayAccessWeakGlobals(self))) { weak_globals_add_condition_.WaitHoldingLocks(self); } - return weak_globals_.Get(ref); + return weak_globals_.Get(ref).Ptr(); } mirror::Object* JavaVMExt::DecodeWeakGlobalDuringShutdown(Thread* self, IndirectRef ref) { @@ -695,7 +695,7 @@ mirror::Object* JavaVMExt::DecodeWeakGlobalDuringShutdown(Thread* self, Indirect if (!kUseReadBarrier) { DCHECK(allow_accessing_weak_globals_.LoadSequentiallyConsistent()); } - return weak_globals_.SynchronizedGet(ref); + return weak_globals_.SynchronizedGet(ref).Ptr(); } bool JavaVMExt::IsWeakGlobalCleared(Thread* self, IndirectRef ref) { |