commit 9539150b85142c18e9e8c2264b5b6100942667c3
author Alex Light <allight@google.com> Thu Dec 03 17:38:56 2015 -0800
committer Alex Light <allight@google.com> Mon Dec 14 14:54:01 2015 -0800
tree 733f2af56f94cbac19ac29f62d85850df2fd7b7d
parent 1997d7cef12ac9906c23b59fdaa9f7f68344b98d

Combine direct_methods_ and virtual_methods_ fields of mirror::Class

Manual cherry-pick of 6286a97 to master

This makes several parts of the overall runtime simpler and reduces
the size of a class object by 32-bits.

Bug: 24618811

Change-Id: I36129b52189e26898ea56fa2b7b45652e06af236

runtime/asm_support.h

diff --git a/runtime/asm_support.h b/runtime/asm_support.h
index 5ec8973..cb01a64 100644
--- a/runtime/asm_support.h
+++ b/runtime/asm_support.h
@@ -166,10 +166,10 @@
 #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 (108 + MIRROR_OBJECT_HEADER_SIZE)
+#define MIRROR_CLASS_OBJECT_SIZE_OFFSET (100 + MIRROR_OBJECT_HEADER_SIZE)
 ADD_TEST_EQ(MIRROR_CLASS_OBJECT_SIZE_OFFSET,
             art::mirror::Class::ObjectSizeOffset().Int32Value())
-#define MIRROR_CLASS_STATUS_OFFSET (120 + MIRROR_OBJECT_HEADER_SIZE)
+#define MIRROR_CLASS_STATUS_OFFSET (112 + MIRROR_OBJECT_HEADER_SIZE)
 ADD_TEST_EQ(MIRROR_CLASS_STATUS_OFFSET,
             art::mirror::Class::StatusOffset().Int32Value())