Remove read barriers in Class::IsClassClass and Object::IsClass
Remove unnecessary read barriers since Class.class is not movable.
Test: test-art-host
Bug: 114413743
Change-Id: Id68562606bab75bf5ba99a7e8a38e7db9d46df1d
diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h
index 51dc1a4..d3f8921 100644
--- a/runtime/mirror/class-inl.h
+++ b/runtime/mirror/class-inl.h
@@ -378,7 +378,7 @@
inline bool Class::IsVariableSize() {
// Classes, arrays, and strings vary in size, and so the object_size_ field cannot
// be used to Get their instance size
- return IsClassClass<kVerifyFlags, kReadBarrierOption>() ||
+ return IsClassClass<kVerifyFlags>() ||
IsArrayClass<kVerifyFlags, kReadBarrierOption>() ||
IsStringClass();
}
@@ -853,10 +853,12 @@
return size;
}
-template<VerifyObjectFlags kVerifyFlags, ReadBarrierOption kReadBarrierOption>
+template<VerifyObjectFlags kVerifyFlags>
inline bool Class::IsClassClass() {
- ObjPtr<Class> java_lang_Class = GetClass<kVerifyFlags, kReadBarrierOption>()->
- template GetClass<kVerifyFlags, kReadBarrierOption>();
+ // OK to look at from-space copies since java.lang.Class.class is not movable.
+ // See b/114413743
+ ObjPtr<Class> java_lang_Class = GetClass<kVerifyFlags, kWithoutReadBarrier>()->
+ template GetClass<kVerifyFlags, kWithoutReadBarrier>();
return this == java_lang_Class;
}