commit 9a41fb1616df7e966e58cabc2abc1b5d90c9e14f
author Brian Carlstrom <bdc@google.com> Fri Oct 31 21:33:35 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 31 21:33:36 2014 +0000
tree e185062a7136e978d48dcd28413f162db43284a1
parent 57b4d1c44e246dfd4aaef2d23b20a696a0c5e57e
parent f322c4cb1290a53e3fc4dca4217810484ecc8f20

Merge "Fix FindDeclaredVirtualMethod(DexCache...) for miranda methods"

runtime/mirror/class.cc

diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc
index 8eafd6f..884aac1 100644
--- a/runtime/mirror/class.cc
+++ b/runtime/mirror/class.cc
@@ -489,7 +489,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;
       }
     }