commit 9ffb039a548996bdc136ae0b2eb42b709d64f1cc
author Ian Rogers <irogers@google.com> Mon Sep 10 11:56:50 2012 -0700
committer Ian Rogers <irogers@google.com> Mon Sep 10 13:47:05 2012 -0700
tree 5de92142b169253a4602a188ee37d97cd0c07081
parent 18c24b6e05e7591069f1a2ac9c614b28fc0853ac

Don't retry verification at compile time.

We don't re-verify verified or erroneous classes at compile time. We
also need to not re-verify compile time verified classes or else the
class status can become misleading.

This should fix races seen in dalvik-dev builds since parallel
verification was re-enabled.

Some other code and logic clean up.

Change-Id: Iff8987292064b825742c52e408d38c31eb25c526

src/compiler.cc

diff --git a/src/compiler.cc b/src/compiler.cc
index b010750..b80b6a6 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -1257,7 +1257,8 @@
     Thread::Current()->ClearException();
   }
 
-  CHECK(klass->IsCompileTimeVerified() || klass->IsErroneous()) << PrettyClass(klass);
+  CHECK(klass->IsCompileTimeVerified() || klass->IsErroneous())
+      << PrettyDescriptor(klass) << ": state=" << klass->GetStatus();
   CHECK(!Thread::Current()->IsExceptionPending()) << PrettyTypeOf(Thread::Current()->GetException());
 }