diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-12-16 03:32:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-16 03:32:18 +0000 |
| commit | f610c0597e001cb1043aa4074afe25ae79a800e3 (patch) | |
| tree | e165a620f4f1db106c7a9937ace88ddb0ff77888 | |
| parent | 50d55c65f3096bccbccddef3aa734ee15647cbe5 (diff) | |
| parent | 487c1c9a0ae4022ef01c95bd92a6ea9cb14dc59c (diff) | |
| download | art-f610c0597e001cb1043aa4074afe25ae79a800e3.zip art-f610c0597e001cb1043aa4074afe25ae79a800e3.tar.gz art-f610c0597e001cb1043aa4074afe25ae79a800e3.tar.bz2 | |
Merge "Don't add or remove verifiers if aborting"
| -rw-r--r-- | runtime/runtime.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 07e2ec0..e91f7c0 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -1380,12 +1380,18 @@ void Runtime::SetCompileTimeClassPath(jobject class_loader, void Runtime::AddMethodVerifier(verifier::MethodVerifier* verifier) { DCHECK(verifier != nullptr); + if (gAborting) { + return; + } MutexLock mu(Thread::Current(), method_verifier_lock_); method_verifiers_.insert(verifier); } void Runtime::RemoveMethodVerifier(verifier::MethodVerifier* verifier) { DCHECK(verifier != nullptr); + if (gAborting) { + return; + } MutexLock mu(Thread::Current(), method_verifier_lock_); auto it = method_verifiers_.find(verifier); CHECK(it != method_verifiers_.end()); |