Stronger alignment check in ArtField::SetOffset().
Do not restrict the DCHECK() to boot image compilation.
Check the alignment for all field types.
Test: m test-art-host-gtest
Test: testruner.py --host --optimizing
Change-Id: I18439615016ac77b47e672f8c0788d3b082d280a
diff --git a/runtime/art_field.cc b/runtime/art_field.cc
index 6e55f9f..639ee2b 100644
--- a/runtime/art_field.cc
+++ b/runtime/art_field.cc
@@ -33,13 +33,8 @@
void ArtField::SetOffset(MemberOffset num_bytes) {
DCHECK(GetDeclaringClass()->IsLoaded() || GetDeclaringClass()->IsErroneous());
- if (kIsDebugBuild && Runtime::Current()->IsAotCompiler() &&
- Runtime::Current()->IsCompilingBootImage()) {
- Primitive::Type type = GetTypeAsPrimitiveType();
- if (type == Primitive::kPrimDouble || type == Primitive::kPrimLong) {
- DCHECK_ALIGNED(num_bytes.Uint32Value(), 8);
- }
- }
+ DCHECK_ALIGNED_PARAM(num_bytes.Uint32Value(),
+ Primitive::ComponentSize(GetTypeAsPrimitiveType()));
// Not called within a transaction.
offset_ = num_bytes.Uint32Value();
}