commit da6a90e179b29aa45a383cbc0bbe7f907417c408
author jeffhao <jeffhao@google.com> Thu Aug 30 18:49:03 2012 -0700
committer jeffhao <jeffhao@google.com> Thu Aug 30 18:49:03 2012 -0700
tree 4ccda67f6274f0febdc1879c852b18fedb2b8e4c
parent e4f0b2ab4abd8e942a099e9b9b4682fbdd9eb21c

Prevent miranda methods from being thrown away during resolution.

This fixes the maps issue.

Change-Id: I70ec279c19de5ecfa04e20eaed90fab019953d9c

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index 343c580..8ee3b1e 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -3485,7 +3485,8 @@
         // TODO: appropriate checks for call to super class.
         break;
       case kVirtual:
-        if (resolved->IsConstructor() || resolved->GetDeclaringClass()->IsInterface()) {
+        if (resolved->IsConstructor() || (resolved->GetDeclaringClass()->IsInterface() &&
+                                          !resolved->IsMiranda())) {
           resolved = NULL;  // Incompatible class change.
         }
         break;