From c4f3925490a73da8dc74884a1deb965d4ecaf14e Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 5 Oct 2016 18:32:08 -0700 Subject: Move remaining jobject related functions to use ObjPtr Also added ObjPtr::DownCast. Bug: 31113334 Test: test-art-host Change-Id: I59c253211dc435579ffdfd49f856861ab13d262c --- runtime/java_vm_ext.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'runtime/java_vm_ext.h') diff --git a/runtime/java_vm_ext.h b/runtime/java_vm_ext.h index 558ffffe5a..2e59a9d65f 100644 --- a/runtime/java_vm_ext.h +++ b/runtime/java_vm_ext.h @@ -137,23 +137,23 @@ class JavaVMExt : public JavaVM { void SweepJniWeakGlobals(IsMarkedVisitor* visitor) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!weak_globals_lock_); - mirror::Object* DecodeGlobal(IndirectRef ref) + ObjPtr DecodeGlobal(IndirectRef ref) REQUIRES_SHARED(Locks::mutator_lock_); - void UpdateGlobal(Thread* self, IndirectRef ref, mirror::Object* result) + void UpdateGlobal(Thread* self, IndirectRef ref, ObjPtr result) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!globals_lock_); - mirror::Object* DecodeWeakGlobal(Thread* self, IndirectRef ref) + ObjPtr DecodeWeakGlobal(Thread* self, IndirectRef ref) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!weak_globals_lock_); - mirror::Object* DecodeWeakGlobalLocked(Thread* self, IndirectRef ref) + ObjPtr DecodeWeakGlobalLocked(Thread* self, IndirectRef ref) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(weak_globals_lock_); // Like DecodeWeakGlobal() but to be used only during a runtime shutdown where self may be // null. - mirror::Object* DecodeWeakGlobalDuringShutdown(Thread* self, IndirectRef ref) + ObjPtr DecodeWeakGlobalDuringShutdown(Thread* self, IndirectRef ref) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!weak_globals_lock_); @@ -166,7 +166,7 @@ class JavaVMExt : public JavaVM { return weak_globals_lock_; } - void UpdateWeakGlobal(Thread* self, IndirectRef ref, mirror::Object* result) + void UpdateWeakGlobal(Thread* self, IndirectRef ref, ObjPtr result) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!weak_globals_lock_); const JNIInvokeInterface* GetUncheckedFunctions() const { -- cgit v1.2.3-59-g8ed1b