From 90b936ddda63139ff46a6755c3b83ad6e4ab4ac5 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Tue, 31 Jan 2017 08:58:55 -0800 Subject: ART: Refactor verify_object.h Move the actual VerifyObject check into a new cc file, as we commonly don't enable the check at all. This allows to cut the -inl include from almost all current users. This also exposes missing -inl includes. Also fix up some of our old mess where .h defined functions require -inl.h defined functions. Test: m Change-Id: I3dd821bbe2015564a29bf1ed9be00f7a7276ad61 --- runtime/scoped_thread_state_change.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'runtime/scoped_thread_state_change.h') diff --git a/runtime/scoped_thread_state_change.h b/runtime/scoped_thread_state_change.h index b4992586ce..24199f76b6 100644 --- a/runtime/scoped_thread_state_change.h +++ b/runtime/scoped_thread_state_change.h @@ -159,16 +159,14 @@ class ScopedObjectAccess : public ScopedObjectAccessUnchecked { public: ALWAYS_INLINE explicit ScopedObjectAccess(JNIEnv* env) REQUIRES(!Locks::thread_suspend_count_lock_) - SHARED_LOCK_FUNCTION(Locks::mutator_lock_) - : ScopedObjectAccessUnchecked(env) {} + SHARED_LOCK_FUNCTION(Locks::mutator_lock_); ALWAYS_INLINE explicit ScopedObjectAccess(Thread* self) REQUIRES(!Locks::thread_suspend_count_lock_) - SHARED_LOCK_FUNCTION(Locks::mutator_lock_) - : ScopedObjectAccessUnchecked(self) {} + SHARED_LOCK_FUNCTION(Locks::mutator_lock_); // Base class will release share of lock. Invoked after this destructor. - ~ScopedObjectAccess() UNLOCK_FUNCTION(Locks::mutator_lock_) ALWAYS_INLINE {} + ~ScopedObjectAccess() UNLOCK_FUNCTION(Locks::mutator_lock_) ALWAYS_INLINE; private: // TODO: remove this constructor. It is used by check JNI's ScopedCheck to make it believe that -- cgit v1.2.3-59-g8ed1b