commit 1cb66f5f569a3c631d940d8bd10f7466e5e5ed29
author buzbee <buzbee@google.com> Tue Oct 18 14:00:10 2011 -0700
committer buzbee <buzbee@google.com> Tue Oct 18 15:31:17 2011 -0700
tree 0d9410087fffcf7075d3b66d066365d6e872c3fb
parent 94ce37a3919a0bdb8855a3d3264a50df1dbc41be

Update CodeAndDirectMethods

Update the CodeAndDirectMethods table following a
call to the unresolved target stub.  Removes a previous
change that tried to do this in ResolveMethod.

Change-Id: I078d3c006a54ca124f217b01b60d0bd813e189e4

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index 61af24d..7ca0361 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -2626,9 +2626,6 @@
   }
   if (resolved != NULL) {
     dex_cache->SetResolvedMethod(method_idx, resolved);
-    if (is_direct && resolved->GetCode() != NULL) {
-      dex_cache->GetCodeAndDirectMethods()->SetResolvedDirectMethod(method_idx, resolved);
-    }
   } else {
     ThrowNoSuchMethodError(is_direct ? "direct" : "virtual", klass, name, signature);
   }

src/runtime_support.cc

diff --git a/src/runtime_support.cc b/src/runtime_support.cc
index a8243e2..9b32d69 100644
--- a/src/runtime_support.cc
+++ b/src/runtime_support.cc
@@ -399,6 +399,10 @@
   }
   // Resolve method filling in dex cache
   Method* called = linker->ResolveMethod(method_idx, *caller_sp, true);
+  // Update CodeAndDirectMethod table
+  Method* caller = *caller_sp;
+  DexCache* dex_cache = caller->GetDeclaringClass()->GetDexCache();
+  dex_cache->GetCodeAndDirectMethods()->SetResolvedDirectMethod(method_idx, called);
   if (LIKELY(!thread->IsExceptionPending())) {
     // We got this far, ensure that the declaring class is initialized
     linker->EnsureInitialized(called->GetDeclaringClass(), true);