diff options
| author | 2015-08-27 20:31:29 +0000 | |
|---|---|---|
| committer | 2015-08-27 20:31:29 +0000 | |
| commit | bde67673534cf4f5c832df04f82e4703e819a3bd (patch) | |
| tree | 1faa5e356e1a87a4972fe155cad7edb5b55fb2bb /compiler/driver/compiler_driver.cc | |
| parent | dfb5f9ceb277f30ee961b27e72d968e0695611a6 (diff) | |
| parent | a727e372d8f6929cd30b983f6969c7a50fc83bb6 (diff) | |
Merge "ART: Balanced locking"
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index c006e62a16..89668f2e4e 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -601,7 +601,7 @@ static void CompileMethod(Thread* self, // Do not have failures that should punt to the interpreter. !verified_method->HasRuntimeThrow() && (verified_method->GetEncounteredVerificationFailures() & - verifier::VERIFY_ERROR_FORCE_INTERPRETER) == 0 && + (verifier::VERIFY_ERROR_FORCE_INTERPRETER | verifier::VERIFY_ERROR_LOCKING)) == 0 && // Is eligable for compilation by methods-to-compile filter. driver->IsMethodToCompile(method_ref); if (compile) { |