diff options
| author | 2012-09-10 11:56:50 -0700 | |
|---|---|---|
| committer | 2012-09-10 13:47:05 -0700 | |
| commit | 9ffb039a548996bdc136ae0b2eb42b709d64f1cc (patch) | |
| tree | 5de92142b169253a4602a188ee37d97cd0c07081 /src/compiler.cc | |
| parent | 18c24b6e05e7591069f1a2ac9c614b28fc0853ac (diff) | |
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
Diffstat (limited to 'src/compiler.cc')
| -rw-r--r-- | src/compiler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler.cc b/src/compiler.cc index b010750b58..b80b6a6600 100644 --- a/src/compiler.cc +++ b/src/compiler.cc @@ -1257,7 +1257,8 @@ static void VerifyClass(const CompilationContext* context, size_t class_def_inde 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()); } |