commit 9780f97d4864f33150407707e6ca09a8a7a20914
author Brian Carlstrom <bdc@google.com> Tue May 06 20:45:54 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 06 20:45:54 2014 +0000
tree a023d533fcd4d1652875a43322d6e25db907c33f
parent af12bccb38f823dad75b48229cdb1d58d48cf3a9
parent 33f2e594cc37570de9fc806e1cf66767205f20a2

Merge "Add more context for CHECKs"

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 03ceed3..bf1de86 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -3126,9 +3126,10 @@
     return nullptr;
   }
   mirror::ObjectArray<mirror::ArtMethod>* vtable = actual_arg_type.GetClass()->GetVTable();
-  CHECK(vtable != nullptr);
+  CHECK(vtable != nullptr) << PrettyDescriptor(actual_arg_type.GetClass());
   uint16_t vtable_index = is_range ? inst->VRegB_3rc() : inst->VRegB_35c();
-  CHECK_LT(static_cast<int32_t>(vtable_index), vtable->GetLength());
+  CHECK_LT(static_cast<int32_t>(vtable_index), vtable->GetLength())
+      << PrettyDescriptor(actual_arg_type.GetClass());
   mirror::ArtMethod* res_method = vtable->Get(vtable_index);
   CHECK(!Thread::Current()->IsExceptionPending());
   return res_method;