diff options
author | 2017-01-31 08:58:55 -0800 | |
---|---|---|
committer | 2017-02-03 10:03:52 -0800 | |
commit | 90b936ddda63139ff46a6755c3b83ad6e4ab4ac5 (patch) | |
tree | c7ce2c3004eecc16ab41ed7cde105c3019638d4b /runtime/mirror/class-inl.h | |
parent | b78a8af993e877d74c5938f65f95feaf2fa01321 (diff) |
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
Diffstat (limited to 'runtime/mirror/class-inl.h')
-rw-r--r-- | runtime/mirror/class-inl.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h index 6a65e1271f..5465e37993 100644 --- a/runtime/mirror/class-inl.h +++ b/runtime/mirror/class-inl.h @@ -635,23 +635,6 @@ inline void Class::SetClinitThreadId(pid_t new_clinit_thread_id) { } } -template<VerifyObjectFlags kVerifyFlags> -inline uint32_t Class::GetAccessFlags() { - // Check class is loaded/retired or this is java.lang.String that has a - // circularity issue during loading the names of its members - DCHECK(IsIdxLoaded<kVerifyFlags>() || IsRetired<kVerifyFlags>() || - IsErroneous<static_cast<VerifyObjectFlags>(kVerifyFlags & ~kVerifyThis)>() || - this == String::GetJavaLangString()) - << "IsIdxLoaded=" << IsIdxLoaded<kVerifyFlags>() - << " IsRetired=" << IsRetired<kVerifyFlags>() - << " IsErroneous=" << - IsErroneous<static_cast<VerifyObjectFlags>(kVerifyFlags & ~kVerifyThis)>() - << " IsString=" << (this == String::GetJavaLangString()) - << " status= " << GetStatus<kVerifyFlags>() - << " descriptor=" << PrettyDescriptor(); - return GetField32<kVerifyFlags>(AccessFlagsOffset()); -} - inline String* Class::GetName() { return GetFieldObject<String>(OFFSET_OF_OBJECT_MEMBER(Class, name_)); } |