diff options
| author | 2017-06-05 16:42:13 -0700 | |
|---|---|---|
| committer | 2017-06-05 20:28:21 -0700 | |
| commit | 508fdf3eb53824f109c89f98484927085bdc43ba (patch) | |
| tree | 4ed08886adc50962b7fd46936923e29057e2fdb2 /runtime/mirror/reference.h | |
| parent | 2ff3b97500b717f69415ae474d5cfb1613cd15ee (diff) | |
ART: Small class-inl.h cleanup
Remove unnecessary class_linker-inl.h include, and fix up all
transitives (mainly gc_root-inl.h). Also clean up reference.h.
Test: m test-art-host
Change-Id: I47bd6edcfe4a23821e37a6e6fa8cca91d0d2d226
Diffstat (limited to 'runtime/mirror/reference.h')
| -rw-r--r-- | runtime/mirror/reference.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/runtime/mirror/reference.h b/runtime/mirror/reference.h index cfcbd5ae1f..b10c29444e 100644 --- a/runtime/mirror/reference.h +++ b/runtime/mirror/reference.h @@ -18,6 +18,8 @@ #define ART_RUNTIME_MIRROR_REFERENCE_H_ #include "base/enums.h" +#include "base/macros.h" +#include "base/mutex.h" #include "class.h" #include "gc_root.h" #include "obj_ptr.h" @@ -97,10 +99,7 @@ class MANAGED Reference : public Object { } template<ReadBarrierOption kReadBarrierOption = kWithReadBarrier> - static Class* GetJavaLangRefReference() REQUIRES_SHARED(Locks::mutator_lock_) { - DCHECK(!java_lang_ref_Reference_.IsNull()); - return java_lang_ref_Reference_.Read<kReadBarrierOption>(); - } + static ALWAYS_INLINE Class* GetJavaLangRefReference() REQUIRES_SHARED(Locks::mutator_lock_); static void SetClass(ObjPtr<Class> klass); static void ResetClass(); static void VisitRoots(RootVisitor* visitor) REQUIRES_SHARED(Locks::mutator_lock_); |