commit b7fbafdac8cf0ff8f860e6e85646d6c88d3914ed
author Andreas Gampe <agampe@google.com> Tue Aug 26 17:11:38 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 26 17:11:38 2014 +0000
tree 7e2b298f7563d4c964772b40a2a580b7a7c1d0a5
parent 654881ffd780066fe1160320059ae629416b4652
parent df7337508381dce5e653b2e7a2ee4ca93103d67c

Merge "ART: kSuper also has IncompatibleClassChangeError"

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index c2f8062..c696089 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -5152,7 +5152,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) {