diff options
Diffstat (limited to 'runtime/mirror')
| -rw-r--r-- | runtime/mirror/class-inl.h | 9 | ||||
| -rw-r--r-- | runtime/mirror/class.h | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h index 726e928598..3f67468148 100644 --- a/runtime/mirror/class-inl.h +++ b/runtime/mirror/class-inl.h @@ -741,6 +741,15 @@ inline void Class::InitializeClassVisitor::operator()( klass->SetDexTypeIndex(DexFile::kDexNoIndex16); // Default to no valid type index. } +inline void Class::SetAccessFlags(uint32_t new_access_flags) { + // Called inside a transaction when setting pre-verified flag during boot image compilation. + if (Runtime::Current()->IsActiveTransaction()) { + SetField32<true>(OFFSET_OF_OBJECT_MEMBER(Class, access_flags_), new_access_flags); + } else { + SetField32<false>(OFFSET_OF_OBJECT_MEMBER(Class, access_flags_), new_access_flags); + } +} + } // namespace mirror } // namespace art diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h index cf9501ad3c..cff8236f6b 100644 --- a/runtime/mirror/class.h +++ b/runtime/mirror/class.h @@ -219,10 +219,7 @@ class MANAGED Class FINAL : public Object { template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags> uint32_t GetAccessFlags() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - void SetAccessFlags(uint32_t new_access_flags) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - // Not called within a transaction. - SetField32<false>(OFFSET_OF_OBJECT_MEMBER(Class, access_flags_), new_access_flags); - } + void SetAccessFlags(uint32_t new_access_flags) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); // Returns true if the class is an interface. bool IsInterface() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { |