commit 4155fcd385bebe869e04c50ff99f4d3d608097bb
author jeffhao <jeffhao@google.com> Wed Mar 21 11:42:12 2012 -0700
committer jeffhao <jeffhao@google.com> Fri Mar 23 16:56:56 2012 -0700
tree fd8556bbd5c10d77a55d87db16649706dcf81e44
parent 47282e59ca60fc8a1e02b23a1cb59916dd7c8b81

Fix sharpening of super when methods class == referrer class.

(cherry picked from commit 6791bdb5ce8daca5a555117e9b02d11437f81542)

Change-Id: I41e11858e657174dd241b6227c03c54c7992f0fa

src/compiler.cc

diff --git a/src/compiler.cc b/src/compiler.cc
index ce34f0f..72cabbf 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -767,19 +767,16 @@
         bool can_sharpen = type == kVirtual && (resolved_method->IsFinal() ||
                                                 methods_class->IsFinal());
         // ensure the vtable index will be correct to dispatch in the vtable of the super class
-        can_sharpen = can_sharpen || (type == kSuper &&
+        can_sharpen = can_sharpen || (type == kSuper && referrer_class != methods_class &&
                                       referrer_class->IsSubClass(methods_class) &&
-                                      vtable_idx < methods_class->GetVTable()->GetLength());
+                                      vtable_idx < methods_class->GetVTable()->GetLength() &&
+                                      methods_class->GetVTable()->Get(vtable_idx) == resolved_method);
         if (kEnableSharpening && can_sharpen) {
           stats_->ResolvedMethod(type);
           // Sharpen a virtual call into a direct call. The method_idx is into referrer's
           // dex cache, check that this resolved method is where we expect it.
           CHECK(referrer_class->GetDexCache()->GetResolvedMethod(method_idx) == resolved_method)
             << PrettyMethod(resolved_method);
-          if (type == kSuper) {
-            CHECK(methods_class->GetVTable()->Get(vtable_idx) == resolved_method)
-              << PrettyMethod(resolved_method);
-          }
           stats_->VirtualMadeDirect(type);
           GetCodeAndMethodForDirectCall(type, kDirect, resolved_method, direct_code, direct_method);
           type = kDirect;