diff options
| author | 2019-01-07 10:19:49 -0800 | |
|---|---|---|
| committer | 2019-01-09 12:38:30 -0800 | |
| commit | 49b74a8c685acfe43dd33e3f51a24c486388bee1 (patch) | |
| tree | 2c88245108b612904d1b3e377725894574ec1eed /runtime/mirror/class.h | |
| parent | a1ffdba7e285435cbb3538473f25eb7cb47cfd66 (diff) | |
ART: Remove thread from class.h
Move only dependent functions to the inl.
Bug: 119869270
Test: mmma art
Change-Id: Ic2ceba1563ac44048afec6df1bccda91ceb42782
Diffstat (limited to 'runtime/mirror/class.h')
| -rw-r--r-- | runtime/mirror/class.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h index f7a41f7f56..d35d526dab 100644 --- a/runtime/mirror/class.h +++ b/runtime/mirror/class.h @@ -30,7 +30,6 @@ #include "object.h" #include "object_array.h" #include "read_barrier_option.h" -#include "thread-current-inl.h" namespace art { @@ -52,6 +51,7 @@ template<typename T> class ArraySlice; class Signature; class StringPiece; template<size_t kNumReferences> class PACKED(4) StackHandleScope; +class Thread; namespace mirror { @@ -223,17 +223,9 @@ class MANAGED Class final : public Object { SetAccessFlags(flags | kAccSkipHiddenapiChecks); } - ALWAYS_INLINE void SetRecursivelyInitialized() REQUIRES_SHARED(Locks::mutator_lock_) { - DCHECK_EQ(GetLockOwnerThreadId(), Thread::Current()->GetThreadId()); - uint32_t flags = GetField32(OFFSET_OF_OBJECT_MEMBER(Class, access_flags_)); - SetAccessFlags(flags | kAccRecursivelyInitialized); - } + ALWAYS_INLINE void SetRecursivelyInitialized() REQUIRES_SHARED(Locks::mutator_lock_); - ALWAYS_INLINE void SetHasDefaultMethods() REQUIRES_SHARED(Locks::mutator_lock_) { - DCHECK_EQ(GetLockOwnerThreadId(), Thread::Current()->GetThreadId()); - uint32_t flags = GetField32(OFFSET_OF_OBJECT_MEMBER(Class, access_flags_)); - SetAccessFlags(flags | kAccHasDefaultMethod); - } + ALWAYS_INLINE void SetHasDefaultMethods() REQUIRES_SHARED(Locks::mutator_lock_); ALWAYS_INLINE void SetFinalizable() REQUIRES_SHARED(Locks::mutator_lock_) { uint32_t flags = GetField32(OFFSET_OF_OBJECT_MEMBER(Class, access_flags_)); |