commit 93e46b2a14050d8f65088ccb44d6fab6c1c46b2c
author Andreas Gampe <agampe@google.com> Thu Mar 10 01:44:24 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 10 01:44:24 2016 +0000
tree 0ab0f1bc9663245622d5a12dd44141785686f6a4
parent 68952cff9744b702f2fc67181c50ea76561c58e9
parent 1a7beaea6f5f12e8248544a6dbe74b90c3b723b5

Merge "ART: Fix assumption in class profile collection"

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 01d140a..d51a1f7 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -7714,7 +7714,10 @@
       }
       ++num_resolved;
       DCHECK(!klass->IsProxyClass());
-      DCHECK(klass->IsResolved());
+      if (!klass->IsResolved()) {
+        DCHECK(klass->IsErroneous());
+        continue;
+      }
       mirror::DexCache* klass_dex_cache = klass->GetDexCache();
       if (klass_dex_cache == dex_cache) {
         const size_t class_def_idx = klass->GetDexClassDefIndex();