diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-11-07 18:38:47 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-11-10 10:07:57 -0800 |
| commit | 5f9a95423dda3a2f945c81a04107fedf18e2c2c1 (patch) | |
| tree | 27f55e828ea076674f9bc510523c675fe6caf3b5 | |
| parent | 974bc2747b345667e07692109d63675ec50955a3 (diff) | |
| download | android_art-5f9a95423dda3a2f945c81a04107fedf18e2c2c1.tar.gz android_art-5f9a95423dda3a2f945c81a04107fedf18e2c2c1.tar.bz2 android_art-5f9a95423dda3a2f945c81a04107fedf18e2c2c1.zip | |
Delete unused imtable field
Bug: 17643507
Change-Id: I1fc7ca2d3bdf1810bcc3b46f867b68a4a6d28ed3
(cherry picked from commit f2d556401ec1d82fec31c0b29d712de18d838282
| -rw-r--r-- | runtime/class_linker_test.cc | 1 | ||||
| -rw-r--r-- | runtime/image.cc | 2 | ||||
| -rw-r--r-- | runtime/mirror/class.h | 3 | ||||
| -rw-r--r-- | runtime/oat.cc | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc index 70807da22e..b2573439fc 100644 --- a/runtime/class_linker_test.cc +++ b/runtime/class_linker_test.cc @@ -517,7 +517,6 @@ struct ClassOffsets : public CheckOffsets<mirror::Class> { offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::Class, direct_methods_), "directMethods")); offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::Class, ifields_), "iFields")); offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::Class, iftable_), "ifTable")); - offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::Class, imtable_), "imTable")); offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::Class, name_), "name")); offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::Class, sfields_), "sFields")); offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::Class, super_class_), "superClass")); diff --git a/runtime/image.cc b/runtime/image.cc index 40f43463ef..aee84bc3c0 100644 --- a/runtime/image.cc +++ b/runtime/image.cc @@ -24,7 +24,7 @@ namespace art { const uint8_t ImageHeader::kImageMagic[] = { 'a', 'r', 't', '\n' }; -const uint8_t ImageHeader::kImageVersion[] = { '0', '1', '1', '\0' }; +const uint8_t ImageHeader::kImageVersion[] = { '0', '1', '2', '\0' }; ImageHeader::ImageHeader(uint32_t image_begin, uint32_t image_size, diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h index 21cf53f8b3..4f1af44794 100644 --- a/runtime/mirror/class.h +++ b/runtime/mirror/class.h @@ -1076,9 +1076,6 @@ class MANAGED Class FINAL : public Object { // methods for the methods in the interface. HeapReference<IfTable> iftable_; - // Interface method table (imt), for quick "invoke-interface". - HeapReference<ObjectArray<ArtMethod>> imtable_; - // Descriptor for the class such as "java.lang.Class" or "[C". Lazily initialized by ComputeName HeapReference<String> name_; diff --git a/runtime/oat.cc b/runtime/oat.cc index 6bda6beac4..0749c06551 100644 --- a/runtime/oat.cc +++ b/runtime/oat.cc @@ -23,7 +23,7 @@ namespace art { const uint8_t OatHeader::kOatMagic[] = { 'o', 'a', 't', '\n' }; -const uint8_t OatHeader::kOatVersion[] = { '0', '4', '5', '\0' }; +const uint8_t OatHeader::kOatVersion[] = { '0', '4', '6', '\0' }; static size_t ComputeOatHeaderSize(const SafeMap<std::string, std::string>* variable_data) { size_t estimate = 0U; |