commit 74180cad94848107cf297d37e72437c5a6eecf1b
author Jeff Hao <jeffhao@google.com> Wed Mar 27 15:29:11 2013 -0700
committer Jeff Hao <jeffhao@google.com> Wed Mar 27 15:29:11 2013 -0700
tree 9dfa6f7183bc7d6085a2753483b0f7a93c3ce486
parent 857fe960a02834c0d6b8792dcc0af8143995cb1f

Remove code related to compiled invoke stubs.

Note that the oat file version is now bumped to 004. A clean-oat will be
necessary after syncing this change.

Change-Id: If8875335b7fcc39b6b40c6f95de07da50da7b6b8

src/oat_file.cc

diff --git a/src/oat_file.cc b/src/oat_file.cc
index 7f7bab9..7c4085e 100644
--- a/src/oat_file.cc
+++ b/src/oat_file.cc
@@ -344,8 +344,7 @@
       oat_method_offsets.fp_spill_mask_,
       oat_method_offsets.mapping_table_offset_,
       oat_method_offsets.vmap_table_offset_,
-      oat_method_offsets.gc_map_offset_,
-      oat_method_offsets.invoke_stub_offset_
+      oat_method_offsets.gc_map_offset_
 #if defined(ART_USE_PORTABLE_COMPILER)
     , oat_method_offsets.proxy_stub_offset_
 #endif
@@ -359,8 +358,7 @@
                               const uint32_t fp_spill_mask,
                               const uint32_t mapping_table_offset,
                               const uint32_t vmap_table_offset,
-                              const uint32_t gc_map_offset,
-                              const uint32_t invoke_stub_offset
+                              const uint32_t gc_map_offset
 #if defined(ART_USE_PORTABLE_COMPILER)
                             , const uint32_t proxy_stub_offset
 #endif
@@ -372,8 +370,7 @@
     fp_spill_mask_(fp_spill_mask),
     mapping_table_offset_(mapping_table_offset),
     vmap_table_offset_(vmap_table_offset),
-    native_gc_map_offset_(gc_map_offset),
-    invoke_stub_offset_(invoke_stub_offset)
+    native_gc_map_offset_(gc_map_offset)
 #if defined(ART_USE_PORTABLE_COMPILER)
   , proxy_stub_offset_(proxy_stub_offset)
 #endif
@@ -417,25 +414,6 @@
 #endif
 }
 
-mirror::AbstractMethod::InvokeStub* OatFile::OatMethod::GetInvokeStub() const {
-  const byte* stub = GetOatPointer<const byte*>(invoke_stub_offset_);
-  return reinterpret_cast<mirror::AbstractMethod::InvokeStub*>(const_cast<byte*>(stub));
-}
-
-uint32_t OatFile::OatMethod::GetInvokeStubSize() const {
-#if defined(ART_USE_PORTABLE_COMPILER)
-  return 0;
-#else
-  uintptr_t code = reinterpret_cast<uint32_t>(GetInvokeStub());
-  if (code == 0) {
-    return 0;
-  }
-  // TODO: make this Thumb2 specific
-  code &= ~0x1;
-  return reinterpret_cast<uint32_t*>(code)[-1];
-#endif
-}
-
 #if defined(ART_USE_PORTABLE_COMPILER)
 const void* OatFile::OatMethod::GetProxyStub() const {
   return GetOatPointer<const void*>(proxy_stub_offset_);
@@ -451,7 +429,6 @@
   method->SetMappingTable(GetMappingTable());
   method->SetVmapTable(GetVmapTable());
   method->SetNativeGcMap(GetNativeGcMap());  // Note, used by native methods in work around JNI mode.
-  method->SetInvokeStub(GetInvokeStub());
 }
 
 }  // namespace art