From 5a851261fd3c083e647e4b10c4ee0c5c31c4be5a Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Thu, 31 Mar 2016 17:49:34 -0700 Subject: [PATCH] Revert "ART: Resolve all classes even when verify-profile" This reverts commit 82e8c1ff6d58e98a52725eeefc6c2407470239d2. The deadlock is fixed by 884f3b83ed6b2a378535ac6b2be57d6b2e22de09. Bug: 27924355 --- compiler/driver/compiler_driver.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 5bfd5f318..d29d528c2 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -833,10 +833,12 @@ 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. - if (never_verify || verification_enabled) { + // Let the verifier resolve as needed for the verify_only_profile case. + if ((never_verify || verification_enabled) && !verify_only_profile) { Resolve(class_loader, dex_files, timings); VLOG(compiler) << "Resolve: " << GetMemoryUsageString(false); } -- 2.11.0