commit 121b25e246b7012cfd895f205855c6102da48305
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Fri Nov 20 11:24:33 2015 +0000
committer Narayan Kamath <narayan@google.com> Sat Nov 21 16:28:15 2015 +0000
tree 8d7e4dae58b59e9a554db03a06c800f3caf5b6b9
parent 31f7afcd651ca5836892d1c24010933fa40c29e4
parent 13ca74fed068a6a49221b5213ce0b1bebeda3ed6

Merge mnc-dr-enso-dev into goog/master

Bug: 25758743
Change-Id: I19d433934f01856e7b5a7392a58b759c3ac386e7

runtime/asm_support.h

diff --git a/runtime/asm_support.h b/runtime/asm_support.h
index 785a9be..5aa6105 100644
--- a/runtime/asm_support.h
+++ b/runtime/asm_support.h
@@ -165,16 +165,16 @@
 ADD_TEST_EQ(size_t(MIRROR_OBJECT_HEADER_SIZE), sizeof(art::mirror::Object))
 
 // Offsets within java.lang.Class.
-#define MIRROR_CLASS_COMPONENT_TYPE_OFFSET (4 + MIRROR_OBJECT_HEADER_SIZE)
+#define MIRROR_CLASS_COMPONENT_TYPE_OFFSET (8 + MIRROR_OBJECT_HEADER_SIZE)
 ADD_TEST_EQ(MIRROR_CLASS_COMPONENT_TYPE_OFFSET,
             art::mirror::Class::ComponentTypeOffset().Int32Value())
-#define MIRROR_CLASS_ACCESS_FLAGS_OFFSET (72 + MIRROR_OBJECT_HEADER_SIZE)
+#define MIRROR_CLASS_ACCESS_FLAGS_OFFSET (36 + MIRROR_OBJECT_HEADER_SIZE)
 ADD_TEST_EQ(MIRROR_CLASS_ACCESS_FLAGS_OFFSET,
             art::mirror::Class::AccessFlagsOffset().Int32Value())
-#define MIRROR_CLASS_OBJECT_SIZE_OFFSET (104 + MIRROR_OBJECT_HEADER_SIZE)
+#define MIRROR_CLASS_OBJECT_SIZE_OFFSET (108 + MIRROR_OBJECT_HEADER_SIZE)
 ADD_TEST_EQ(MIRROR_CLASS_OBJECT_SIZE_OFFSET,
             art::mirror::Class::ObjectSizeOffset().Int32Value())
-#define MIRROR_CLASS_STATUS_OFFSET (116 + MIRROR_OBJECT_HEADER_SIZE)
+#define MIRROR_CLASS_STATUS_OFFSET (120 + MIRROR_OBJECT_HEADER_SIZE)
 ADD_TEST_EQ(MIRROR_CLASS_STATUS_OFFSET,
             art::mirror::Class::StatusOffset().Int32Value())