commit a92f971e55fa68d93d06294e0100674ceac6ec4c
author Mathieu Chartier <mathieuc@google.com> Mon Jul 23 10:56:42 2012 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Jul 23 15:14:32 2012 -0700
tree f0f66ebac3399cf93471cd0ab2bc2132a380461f
parent 4407e61aa4cd75e6f31919cfca6a544d18b88c53

Additional log output for artInvokeCommon code == NULL.

Motivated by an error regarding a possibly corrupted dex file.

Change-Id: I70f8e15151d0c1f00ea2d289a1b43cd88a199290

src/oat/runtime/support_invoke.cc

diff --git a/src/oat/runtime/support_invoke.cc b/src/oat/runtime/support_invoke.cc
index 95dab98..4669688 100644
--- a/src/oat/runtime/support_invoke.cc
+++ b/src/oat/runtime/support_invoke.cc
@@ -38,7 +38,12 @@
   const void* code = method->GetCode();
 
   // When we return, the caller will branch to this address, so it had better not be 0!
-  CHECK(code != NULL) << PrettyMethod(method);
+  if (UNLIKELY(code == NULL)) {
+      MethodHelper mh(method);
+      LOG(FATAL) << "Code was NULL in method: " << PrettyMethod(method)
+                 << " location: " << mh.GetDexFile().GetLocation();
+  }
+
 
   uint32_t method_uint = reinterpret_cast<uint32_t>(method);
   uint64_t code_uint = reinterpret_cast<uint32_t>(code);