From 82e8c1ff6d58e98a52725eeefc6c2407470239d2 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 30 Mar 2016 13:28:44 -0700 Subject: ART: Resolve all classes even when verify-profile Avoid deadlocks. Bug: 27924355 Change-Id: I41e194a7b92075884cbc485d89baf32feb6783cb --- compiler/driver/compiler_driver.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'compiler/driver/compiler_driver.cc') diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index ea16cb2662..5c1c92b712 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -833,12 +833,10 @@ void CompilerDriver::PreCompile(jobject class_loader, const bool verification_enabled = compiler_options_->IsVerificationEnabled(); const bool never_verify = compiler_options_->NeverVerify(); - const bool verify_only_profile = compiler_options_->VerifyOnlyProfile(); // We need to resolve for never_verify since it needs to run dex to dex to add the // RETURN_VOID_NO_BARRIER. - // Let the verifier resolve as needed for the verify_only_profile case. - if ((never_verify || verification_enabled) && !verify_only_profile) { + if (never_verify || verification_enabled) { Resolve(class_loader, dex_files, timings); VLOG(compiler) << "Resolve: " << GetMemoryUsageString(false); } -- cgit v1.2.3-59-g8ed1b