From 4309f6129795ade42591b872e44a33cec95f4e79 Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Wed, 9 Mar 2016 15:52:21 -0800
Subject: [PATCH] ART: Fix assumption in class profile collection

The dex cache may contain erroneous classes. Filter, instead of
DCHECK.

Bug: 27500691
Change-Id: Ic99bca3a7e54a5e7893c801ec5ac92cbf690cd67
---
 runtime/class_linker.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index c2c64c66d..149f918db 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -7749,7 +7749,10 @@ std::set<DexCacheResolvedClasses> ClassLinker::GetResolvedClasses(bool ignore_bo
       }
       ++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();
-- 
2.11.0