commit 3cc3981018b0eb2c4f1b05ed620d8aad36098e7e
author Ian Rogers <irogers@google.com> Thu Oct 11 21:49:32 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 11 21:49:32 2012 -0700
tree 5c6c5ede77af2cfe8cc2a919bc636b52d758a6bf
parent 155dfe958412b71ab2adcc21611217c22277ec69
parent a6389411aaec94222c1c5c7ace7ad47343e6bada

Merge "Fix regression in target run-test 069. ." into dalvik-dev

src/oat/runtime/support_invoke.cc

diff --git a/src/oat/runtime/support_invoke.cc b/src/oat/runtime/support_invoke.cc
index 4656198..e66749d 100644
--- a/src/oat/runtime/support_invoke.cc
+++ b/src/oat/runtime/support_invoke.cc
@@ -27,6 +27,12 @@
   AbstractMethod* method;
   if (LIKELY(interface_method->GetDexMethodIndex() != DexFile::kDexNoIndex16)) {
     method = this_object->GetClass()->FindVirtualMethodForInterface(interface_method);
+    if (UNLIKELY(method == NULL)) {
+      FinishCalleeSaveFrameSetup(self, sp, Runtime::kRefsAndArgs);
+      ThrowIncompatibleClassChangeErrorClassForInterfaceDispatch(interface_method, this_object,
+                                                                 caller_method);
+      return 0;  // Failure.
+    }
   } else {
     FinishCalleeSaveFrameSetup(self, sp, Runtime::kRefsAndArgs);
     DCHECK(interface_method == Runtime::Current()->GetResolutionMethod());
@@ -86,7 +92,7 @@
                                                 false, kInterface);
     if (UNLIKELY(method == NULL)) {
       CHECK(self->IsExceptionPending());
-      return 0;  // failure
+      return 0;  // Failure.
     }
   }
   const void* code = method->GetCode();