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/mirror/abstract_method.cc

diff --git a/src/mirror/abstract_method.cc b/src/mirror/abstract_method.cc
index 2e56004..f74814c 100644
--- a/src/mirror/abstract_method.cc
+++ b/src/mirror/abstract_method.cc
@@ -270,10 +270,7 @@
   ManagedStack fragment;
   self->PushManagedStackFragment(&fragment);
 
-  // Call the invoke stub associated with the method.
-  // Pass everything as arguments.
-  AbstractMethod::InvokeStub* stub = GetInvokeStub();
-
+  // Call the invoke stub, passing everything as arguments.
   if (UNLIKELY(!Runtime::Current()->IsStarted())){
     LOG(INFO) << "Not invoking " << PrettyMethod(this) << " for a runtime that isn't started";
     if (result != NULL) {
@@ -285,8 +282,7 @@
     if (GetCode() != NULL) {
       if (!interpret) {
         if (kLogInvocationStartAndReturn) {
-          LOG(INFO) << StringPrintf("Invoking '%s' code=%p stub=%p",
-                                    PrettyMethod(this).c_str(), GetCode(), stub);
+          LOG(INFO) << StringPrintf("Invoking '%s' code=%p", PrettyMethod(this).c_str(), GetCode());
         }
 #ifdef ART_USE_PORTABLE_COMPILER
         (*art_portable_invoke_stub)(this, args, args_size, self, result, result_type);
@@ -304,8 +300,7 @@
           interpreter::EnterInterpreterFromLLVM(self, shadow_frame, result);
         }
         if (kLogInvocationStartAndReturn) {
-          LOG(INFO) << StringPrintf("Returned '%s' code=%p stub=%p",
-                                    PrettyMethod(this).c_str(), GetCode(), stub);
+          LOG(INFO) << StringPrintf("Returned '%s' code=%p", PrettyMethod(this).c_str(), GetCode());
         }
       } else {
         if (kLogInvocationStartAndReturn) {
@@ -323,8 +318,7 @@
       }
     } else {
       LOG(INFO) << "Not invoking '" << PrettyMethod(this)
-          << "' code=" << reinterpret_cast<const void*>(GetCode())
-          << " stub=" << reinterpret_cast<void*>(stub);
+          << "' code=" << reinterpret_cast<const void*>(GetCode());
       if (result != NULL) {
         result->SetJ(0);
       }