commit 920506d4509fef2486a099c005ec134a5d22ec11
author Vladimir Marko <vmarko@google.com> Tue Nov 18 14:47:31 2014 +0000
committer Vladimir Marko <vmarko@google.com> Tue Nov 18 17:21:22 2014 +0000
tree 8e08045dd689c092789adcd003ab072d2ae0ed8d
parent d3b0c55772d3b2111c4372525a69e3b01e98b1fd

Do not try to sharpen super calls to abstract methods.

Bug: 18380491

(cherry picked from commit 474123dccc5aa9a0dfe566d332174877fd5b7040)

Change-Id: I6637aaa562115f6b07d8637f0cc6658f1a6739bb

compiler/driver/compiler_driver-inl.h

diff --git a/compiler/driver/compiler_driver-inl.h b/compiler/driver/compiler_driver-inl.h
index 1805d59..ebf7874 100644
--- a/compiler/driver/compiler_driver-inl.h
+++ b/compiler/driver/compiler_driver-inl.h
@@ -240,7 +240,8 @@
   bool can_sharpen_super_based_on_type = (*invoke_type == kSuper) &&
       (referrer_class != methods_class) && referrer_class->IsSubClass(methods_class) &&
       resolved_method->GetMethodIndex() < methods_class->GetVTableLength() &&
-      (methods_class->GetVTableEntry(resolved_method->GetMethodIndex()) == resolved_method);
+      (methods_class->GetVTableEntry(resolved_method->GetMethodIndex()) == resolved_method) &&
+      !resolved_method->IsAbstract();
 
   if (can_sharpen_virtual_based_on_type || can_sharpen_super_based_on_type) {
     // Sharpen a virtual call into a direct call. The method_idx is into referrer's