commit 605e014b3512cdd7c766660f88b30d458693bcce
author Sebastien Hertz <shertz@google.com> Wed Apr 08 08:49:19 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 08 08:49:19 2015 +0000
tree 331fc58f5f12216b6862a1305e1fd4c8cd25d168
parent 0e88d7267c58c8449e8216aabe429b22ed5d9e43
parent ca068b2385ba160367d1e7fd123317b851b99390

Merge "Ignore not yet loaded classes during hprof"

runtime/hprof/hprof.cc

diff --git a/runtime/hprof/hprof.cc b/runtime/hprof/hprof.cc
index d6a6595..cdb3e2a 100644
--- a/runtime/hprof/hprof.cc
+++ b/runtime/hprof/hprof.cc
@@ -949,6 +949,10 @@
 }
 
 void Hprof::DumpHeapClass(mirror::Class* klass) {
+  if (!klass->IsLoaded() && !klass->IsErroneous()) {
+    // Class is allocated but not yet loaded: we cannot access its fields or super class.
+    return;
+  }
   size_t sFieldCount = klass->NumStaticFields();
   if (sFieldCount != 0) {
     int byteLength = sFieldCount * sizeof(JValue);  // TODO bogus; fields are packed