commit df7337508381dce5e653b2e7a2ee4ca93103d67c
author Andreas Gampe <agampe@google.com> Mon Aug 25 20:55:01 2014 -0700
committer Andreas Gampe <agampe@google.com> Tue Aug 26 10:10:52 2014 -0700
tree 18596f2a30c076fb41a0ee70baf34e18c7e681ab
parent e18aa4316eb9a15cd6b1051f27a1ce49967c170e

ART: kSuper also has IncompatibleClassChangeError

When resolving methods, kSuper can also have
IncompatibleClassChangeError.

Bug: 17266767

(cherry picked from commit 9cb8d7a9a5013dd1e6734d9643573a4750d869e2)

Change-Id: I5fafe03ad578f605825a3d0c89f1254a4a385b76

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 74c5c15..e36384e 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -5044,7 +5044,11 @@
           }
           break;
         case kSuper:
-          ThrowNoSuchMethodError(type, klass, name, signature);
+          if (resolved != nullptr) {
+            ThrowIncompatibleClassChangeError(type, kDirect, resolved, referrer.Get());
+          } else {
+            ThrowNoSuchMethodError(type, klass, name, signature);
+          }
           break;
         case kVirtual:
           if (resolved != nullptr) {