commit abcf7ae8deba4ee81dec44f3d1a2f0ecaf032859
author Brian Carlstrom <bdc@google.com> Mon Sep 23 22:19:52 2013 -0700
committer Brian Carlstrom <bdc@google.com> Mon Sep 23 22:19:52 2013 -0700
tree 4f8145f8c5ba6cf29e151e88ea31dafb2fecdabb
parent cb5f5e53b580023fa2c1d8235c2e9aa1ff67d1dc

Fix overly restrictive assert

Found by 084-class-init on a clean build.

Bug: 10750824
Change-Id: I7cf1ee190cbddbda98132511527eab36c36da523

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 4a3ae1b..210386a 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -3979,7 +3979,8 @@
       }
     }
   }
-  DCHECK((resolved == NULL) || resolved->IsResolved()) << PrettyDescriptor(resolved);
+  DCHECK((resolved == NULL) || resolved->IsResolved() || resolved->IsErroneous())
+          << PrettyDescriptor(resolved) << " " << resolved->GetStatus();
   return resolved;
 }