commit f3c1f780145511b234ae50de6e8dbd8c541b7bb0
author Ian Rogers <irogers@google.com> Wed Nov 02 14:12:15 2011 -0700
committer Ian Rogers <irogers@google.com> Wed Nov 02 14:12:15 2011 -0700
tree 8380438846543060b14d8529e7265e57e65cd0f6
parent 5d76c435082332ef79a22962386fa92a0870e378

Allow Object to match as interface class target.

Change-Id: Ie99746c8d13aed63507e5c90dcef922f2caba701

src/dex_verifier.cc

diff --git a/src/dex_verifier.cc b/src/dex_verifier.cc
index 8793c95..9f66250 100644
--- a/src/dex_verifier.cc
+++ b/src/dex_verifier.cc
@@ -2481,7 +2481,7 @@
       if (failure_ == VERIFY_ERROR_NONE) {
         if (abs_method != NULL) {
           Class* called_interface = abs_method->GetDeclaringClass();
-          if (!called_interface->IsInterface()) {
+          if (!called_interface->IsInterface() && !called_interface->IsObjectClass()) {
             Fail(VERIFY_ERROR_CLASS_CHANGE) << "expected interface class in invoke-interface '"
                                             << PrettyMethod(abs_method) << "'";
             break;