commit 64d79730c33777a62e108942909773e5e782ece3
author Brian Carlstrom <bdc@google.com> Fri Oct 31 14:33:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 31 14:33:51 2014 +0000
tree 81d8b4fc65c73b090401495716d9a2dbd2b429cc
parent 2759810fc4dab86c52f23c8603e5c7479182ae21
parent 9a783d6a0cb437fc0d9ffcc84502912f3d1cb73b

am 9a783d6a: Fix FindDeclaredVirtualMethod(DexCache...) for miranda methods

* commit '9a783d6a0cb437fc0d9ffcc84502912f3d1cb73b':
  Fix FindDeclaredVirtualMethod(DexCache...) for miranda methods

runtime/mirror/class.cc

diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc
index 5b8eb82..c10e8b1 100644
--- a/runtime/mirror/class.cc
+++ b/runtime/mirror/class.cc
@@ -499,7 +499,9 @@
   if (GetDexCache() == dex_cache) {
     for (size_t i = 0; i < NumVirtualMethods(); ++i) {
       ArtMethod* method = GetVirtualMethod(i);
-      if (method->GetDexMethodIndex() == dex_method_idx) {
+      if (method->GetDexMethodIndex() == dex_method_idx &&
+          // A miranda method may have a different DexCache.
+          method->GetDexCache() == dex_cache) {
         return method;
       }
     }