diff options
| -rw-r--r-- | compiler/optimizing/nodes.h | 2 | ||||
| -rw-r--r-- | runtime/entrypoints/quick/quick_trampoline_entrypoints.cc | 3 | ||||
| -rw-r--r-- | runtime/handle.h | 3 | ||||
| -rw-r--r-- | runtime/handle_scope.h | 3 |
4 files changed, 4 insertions, 7 deletions
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 5246fd1f05..41c2f17cd9 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -159,7 +159,7 @@ class ReferenceTypeInfo : ValueObject { static ReferenceTypeInfo CreateInvalid() { return ReferenceTypeInfo(); } - static bool IsValidHandle(TypeHandle handle) SHARED_REQUIRES(Locks::mutator_lock_) { + static bool IsValidHandle(TypeHandle handle) { return handle.GetReference() != nullptr; } diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc index 08c9b49729..638fdb4f46 100644 --- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc @@ -1779,8 +1779,7 @@ class BuildGenericJniFrameVisitor FINAL : public QuickArgumentVisitor { void FinalizeHandleScope(Thread* self) SHARED_REQUIRES(Locks::mutator_lock_); - StackReference<mirror::Object>* GetFirstHandleScopeEntry() - SHARED_REQUIRES(Locks::mutator_lock_) { + StackReference<mirror::Object>* GetFirstHandleScopeEntry() { return handle_scope_->GetHandle(0).GetReference(); } diff --git a/runtime/handle.h b/runtime/handle.h index 5b3bb60dfa..5df010bb1d 100644 --- a/runtime/handle.h +++ b/runtime/handle.h @@ -70,8 +70,7 @@ class Handle : public ValueObject { return reinterpret_cast<jobject>(reference_); } - ALWAYS_INLINE StackReference<mirror::Object>* GetReference() - SHARED_REQUIRES(Locks::mutator_lock_) { + ALWAYS_INLINE StackReference<mirror::Object>* GetReference() { return reference_; } diff --git a/runtime/handle_scope.h b/runtime/handle_scope.h index e617348ce8..d53a0e4f96 100644 --- a/runtime/handle_scope.h +++ b/runtime/handle_scope.h @@ -62,8 +62,7 @@ class PACKED(4) HandleScope { ALWAYS_INLINE mirror::Object* GetReference(size_t i) const SHARED_REQUIRES(Locks::mutator_lock_); - ALWAYS_INLINE Handle<mirror::Object> GetHandle(size_t i) - SHARED_REQUIRES(Locks::mutator_lock_); + ALWAYS_INLINE Handle<mirror::Object> GetHandle(size_t i); ALWAYS_INLINE MutableHandle<mirror::Object> GetMutableHandle(size_t i) SHARED_REQUIRES(Locks::mutator_lock_); |