commit 474123dccc5aa9a0dfe566d332174877fd5b7040
author Vladimir Marko <vmarko@google.com> Tue Nov 18 15:26:13 2014 +0000
committer Vladimir Marko <vmarko@google.com> Tue Nov 18 15:27:40 2014 +0000
tree 9f3dcf7e97f1fe1c96abfb9f3aa7bcff6cc1fc20
parent acc71b09bb70fd8b55776483644255cd41bc1904

Do not try to sharpen super calls to abstract methods.

Bug: 18380491
Change-Id: I08bfdddb0fe698b3bbe31204b7562fbc08488a35

compiler/driver/compiler_driver-inl.h

diff --git a/compiler/driver/compiler_driver-inl.h b/compiler/driver/compiler_driver-inl.h
index d278884..4e51b0e 100644
--- a/compiler/driver/compiler_driver-inl.h
+++ b/compiler/driver/compiler_driver-inl.h
@@ -232,7 +232,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