commit 09f6b56832467be99aedfae04a2b95e69d88e207
author Ian Rogers <irogers@google.com> Tue Jan 31 21:58:52 2012 -0800
committer Ian Rogers <irogers@google.com> Tue Jan 31 21:58:52 2012 -0800
tree 66a4a82d59f8dfb982e2f76ab35e72798ff3d6d8
parent beb60e28572288772c219a0bd62457d7d9bbd1f5

Improve Throwable::Dump and log location of verify failing classes.

Change-Id: I167596931a338b3de265391df7b3a8f5a1d29bb3

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index 0e9e43a..cccf0f6 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -1898,9 +1898,10 @@
     // Sanity check that a verified class has GC maps on all methods
     CheckMethodsHaveGcMaps(klass);
   } else {
-    LOG(ERROR) << "Verification failed on class " << PrettyClass(klass);
+    LOG(ERROR) << "Verification failed on class " << PrettyDescriptor(klass)
+        << " in " << klass->GetDexCache()->GetLocation()->ToModifiedUtf8();
     Thread* self = Thread::Current();
-    CHECK(!self->IsExceptionPending()) << PrettyTypeOf(self->GetException()) << PrettyClass(klass);
+    CHECK(!self->IsExceptionPending()) << self->GetException()->Dump();
     self->ThrowNewExceptionF("Ljava/lang/VerifyError;", "Verification of %s failed",
         PrettyDescriptor(klass).c_str());
     CHECK_EQ(klass->GetStatus(), Class::kStatusVerifying) << PrettyClass(klass);