commit 06039ba7c5d1251be7bc041cf64069827364d4ce
author Alex Light <allight@google.com> Mon Apr 04 13:23:14 2016 -0700
committer Alex Light <allight@google.com> Mon Apr 04 21:06:52 2016 +0000
tree f4ca699dd52f9095d0da5dc661751ae536509479
parent 1669fe3219f295d14c43d5bd3b4e8d255e52be3f

Fix issue with verification check failure on erroneous classes.

Bug: 27924355

Change-Id: I7d680e7196aeb9e2e6ef54139634564e058174d7

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 7060593..d73f205 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -3786,7 +3786,9 @@
     while (old_status == mirror::Class::kStatusVerifying ||
         old_status == mirror::Class::kStatusVerifyingAtRuntime) {
       lock.WaitIgnoringInterrupts();
-      CHECK_GT(klass->GetStatus(), old_status);
+      CHECK(klass->IsErroneous() || (klass->GetStatus() > old_status))
+          << "Class '" << PrettyClass(klass.Get()) << "' performed an illegal verification state "
+          << "transition from " << old_status << " to " << klass->GetStatus();
       old_status = klass->GetStatus();
     }